diff options
Diffstat (limited to 'net/third_party/nss/patches/negotiatedextension.patch')
| -rw-r--r-- | net/third_party/nss/patches/negotiatedextension.patch | 38 |
1 files changed, 15 insertions, 23 deletions
diff --git a/net/third_party/nss/patches/negotiatedextension.patch b/net/third_party/nss/patches/negotiatedextension.patch index cba4baa..98fbc07 100644 --- a/net/third_party/nss/patches/negotiatedextension.patch +++ b/net/third_party/nss/patches/negotiatedextension.patch @@ -1,16 +1,17 @@ -Index: mozilla/security/nss/lib/ssl/sslreveal.c -=================================================================== -RCS file: /cvsroot/mozilla/security/nss/lib/ssl/sslreveal.c,v -retrieving revision 1.8 -diff -u -p -u -8 -r1.8 sslreveal.c ---- mozilla/security/nss/lib/ssl/sslreveal.c 3 Aug 2010 18:48:45 -0000 1.8 -+++ mozilla/security/nss/lib/ssl/sslreveal.c 25 Aug 2011 00:48:18 -0000 -@@ -106,36 +106,29 @@ SSL_RevealURL(PRFileDesc * fd) - SECStatus - SSL_HandshakeNegotiatedExtension(PRFileDesc * socket, - SSLExtensionType extId, - PRBool *pYes) - { +From 577e6655d4edc789eb4c572b303daf888676a454 Mon Sep 17 00:00:00 2001 +From: Adam Langley <agl@chromium.org> +Date: Mon, 3 Oct 2011 12:27:21 -0400 +Subject: [PATCH] negotiatedextension.patch + +--- + mozilla/security/nss/lib/ssl/sslreveal.c | 9 +-------- + 1 files changed, 1 insertions(+), 8 deletions(-) + +diff --git a/mozilla/security/nss/lib/ssl/sslreveal.c b/mozilla/security/nss/lib/ssl/sslreveal.c +index 94b2c2f..0b9bb82 100644 +--- a/mozilla/security/nss/lib/ssl/sslreveal.c ++++ b/mozilla/security/nss/lib/ssl/sslreveal.c +@@ -111,7 +111,6 @@ SSL_HandshakeNegotiatedExtension(PRFileDesc * socket, /* some decisions derived from SSL_GetChannelInfo */ sslSocket * sslsocket = NULL; SECStatus rv = SECFailure; @@ -18,11 +19,7 @@ diff -u -p -u -8 -r1.8 sslreveal.c if (!pYes) return rv; - - sslsocket = ssl_FindSocket(socket); - if (!sslsocket) { - SSL_DBG(("%d: SSL[%d]: bad socket in HandshakeNegotiatedExtension", - SSL_GETPID(), socket)); +@@ -123,14 +122,8 @@ SSL_HandshakeNegotiatedExtension(PRFileDesc * socket, return rv; } @@ -38,8 +35,3 @@ diff -u -p -u -8 -r1.8 sslreveal.c if (sslsocket->ssl3.initialized) { /* SSL3 and TLS */ /* now we know this socket went through ssl3_InitState() and * ss->xtnData got initialized, which is the only member accessed by - * ssl3_ExtensionNegotiated(); - * Member xtnData appears to get accessed in functions that handle - * the handshake (hello messages and extension sending), - * therefore the handshake lock should be sufficient. - */ |