Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(393)

Unified Diff: net/third_party/nss/ssl/sslsock.c

Issue 17109007: Miscellaneous cleanup of TLS 1.2 code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Make error handling in ssl3_InitHandshakeHashes more uniform. Include the patch file. Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/third_party/nss/ssl/sslimpl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « net/third_party/nss/ssl/sslimpl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698