a809bb
diff -up nss/lib/ssl/sslsock.c.dc nss/lib/ssl/sslsock.c
a809bb
--- nss/lib/ssl/sslsock.c.dc	2020-07-29 14:05:10.413370267 +0200
a809bb
+++ nss/lib/ssl/sslsock.c	2020-07-29 14:06:38.339805833 +0200
a809bb
@@ -798,7 +798,7 @@ SSL_OptionSet(PRFileDesc *fd, PRInt32 wh
a809bb
             break;
a809bb
 
a809bb
         case SSL_ENABLE_DELEGATED_CREDENTIALS:
a809bb
-            ss->opt.enableDelegatedCredentials = val;
a809bb
+            /* disable it for now */
a809bb
             break;
a809bb
 
a809bb
         case SSL_ENABLE_NPN:
a809bb
@@ -1316,7 +1316,7 @@ SSL_OptionSetDefault(PRInt32 which, PRIn
a809bb
             break;
a809bb
 
a809bb
         case SSL_ENABLE_DELEGATED_CREDENTIALS:
a809bb
-            ssl_defaults.enableDelegatedCredentials = val;
a809bb
+            /* disable it for now */
a809bb
             break;
a809bb
 
a809bb
         case SSL_ENABLE_NPN:
a809bb
diff -up nss/gtests/ssl_gtest/manifest.mn.dc nss/gtests/ssl_gtest/manifest.mn
a809bb
--- nss/gtests/ssl_gtest/manifest.mn.dc	2020-07-29 16:46:29.574134443 +0200
a809bb
+++ nss/gtests/ssl_gtest/manifest.mn	2020-07-29 16:46:35.821094263 +0200
a809bb
@@ -56,7 +56,6 @@ CPPSRCS = \
a809bb
       tls_hkdf_unittest.cc \
a809bb
       tls_filter.cc \
a809bb
       tls_protect.cc \
a809bb
-      tls_subcerts_unittest.cc \
a809bb
       tls_esni_unittest.cc \
a809bb
       $(SSLKEYLOGFILE_FILES) \
a809bb
       $(NULL)