Index: net/third_party/nss/ssl/sslsock.c |
=================================================================== |
--- net/third_party/nss/ssl/sslsock.c (revision 206496) |
+++ net/third_party/nss/ssl/sslsock.c (working copy) |
@@ -796,10 +796,7 @@ |
rv = SECFailure; |
} else { |
if (PR_FALSE != on) { |
- /* PKCS#11 bypass is not supported with TLS 1.2. */ |
- if (ss->vrange.max >= SSL_LIBRARY_VERSION_TLS_1_2) { |
- ss->opt.bypassPKCS11 = PR_FALSE; |
- } else if (PR_SUCCESS == SSL_BypassSetup() ) { |
+ if (PR_SUCCESS == SSL_BypassSetup() ) { |
#ifdef NO_PKCS11_BYPASS |
ss->opt.bypassPKCS11 = PR_FALSE; |
#else |
@@ -1964,10 +1961,6 @@ |
} |
ss->vrange.max = SSL_LIBRARY_VERSION_TLS_1_1; |
} |
- /* PKCS#11 bypass is not supported with TLS 1.2. */ |
- if (ss->vrange.max >= SSL_LIBRARY_VERSION_TLS_1_2) { |
- ss->opt.bypassPKCS11 = PR_FALSE; |
- } |
ssl_ReleaseSSL3HandshakeLock(ss); |
ssl_Release1stHandshakeLock(ss); |