nss: revert encrypted and origin bound certificates support.

net/third_party/nss/ssl/sslsock.c

Index: net/third_party/nss/ssl/sslsock.c
diff --git a/net/third_party/nss/ssl/sslsock.c b/net/third_party/nss/ssl/sslsock.c
index 336490280b237088746b8593e20f1b270efd38c0..ebc245ad7e0a2066edff9f245ffa13b55fc74ad2 100644
--- a/net/third_party/nss/ssl/sslsock.c
+++ b/net/third_party/nss/ssl/sslsock.c
@@ -187,8 +187,6 @@ static sslOptions ssl_defaults = {
     PR_FALSE,   /* enableFalseStart   */
     PR_TRUE,    /* cbcRandomIV        */
     PR_FALSE,   /* enableOCSPStapling */
-    PR_FALSE,   /* enableOBCerts */
-    PR_FALSE,   /* encryptClientCerts */
 };
 
 /*
@@ -866,14 +864,6 @@ SSL_OptionSet(PRFileDesc *fd, PRInt32 which, PRBool on)
 	ss->opt.enableOCSPStapling = on;
 	break;
 
-      case SSL_ENABLE_OB_CERTS:
-	ss->opt.enableOBCerts = on;
-	break;
-
-      case SSL_ENCRYPT_CLIENT_CERTS:
-	ss->opt.encryptClientCerts = on;
-	break;
-
       default:
 	PORT_SetError(SEC_ERROR_INVALID_ARGS);
 	rv = SECFailure;
@@ -944,9 +934,6 @@ SSL_OptionGet(PRFileDesc *fd, PRInt32 which, PRBool *pOn)
     case SSL_ENABLE_FALSE_START:  on = ss->opt.enableFalseStart;   break;
     case SSL_CBC_RANDOM_IV:       on = ss->opt.cbcRandomIV;        break;
     case SSL_ENABLE_OCSP_STAPLING: on = ss->opt.enableOCSPStapling; break;
-    case SSL_ENABLE_OB_CERTS:     on = ss->opt.enableOBCerts;      break;
-    case SSL_ENCRYPT_CLIENT_CERTS:
-                                  on = ss->opt.encryptClientCerts; break;
 
     default:
 	PORT_SetError(SEC_ERROR_INVALID_ARGS);
@@ -1008,9 +995,6 @@ SSL_OptionGetDefault(PRInt32 which, PRBool *pOn)
     case SSL_ENABLE_OCSP_STAPLING:
 	on = ssl_defaults.enableOCSPStapling;
 	break;
-    case SSL_ENABLE_OB_CERTS:     on = ssl_defaults.enableOBCerts;      break;
-    case SSL_ENCRYPT_CLIENT_CERTS:
-                                  on = ssl_defaults.encryptClientCerts; break;
 
     default:
 	PORT_SetError(SEC_ERROR_INVALID_ARGS);
@@ -1174,14 +1158,6 @@ SSL_OptionSetDefault(PRInt32 which, PRBool on)
 	ssl_defaults.enableOCSPStapling = on;
 	break;
 
-      case SSL_ENABLE_OB_CERTS:
-	ssl_defaults.enableOBCerts = on;
-	break;
-
-      case SSL_ENCRYPT_CLIENT_CERTS:
-	ssl_defaults.encryptClientCerts = on;
-	break;
-
       default:
 	PORT_SetError(SEC_ERROR_INVALID_ARGS);
 	return SECFailure;