SSL_GetChannelInfo and SSL_GetNegotiatedHostInfo should use

cwSpec instead of crSpec to support False Start.

R=agl@chromium.org
BUG=132947
TEST=none

Review URL: https://chromiumcodereview.appspot.com/10542176

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143015 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 37 insertions, 3 deletions

diff --git a/net/third_party/nss/README.chromium b/net/third_party/nss/README.chromium
index 8c5cb4a..b92d6bc 100644
--- a/net/third_party/nss/README.chromium
+++ b/net/third_party/nss/README.chromium
@@ -73,6 +73,11 @@ Patches:
     support for CLIENT_RANDOM keylogging to support ECDHE-RSA and others.
     patches/keylog.patch
 
+  * SSL_GetChannelInfo and SSL_GetNegotiatedHostInfo should use cwSpec
+    instead of crSpec to support False Start.
+    https://bugzilla.mozilla.org/show_bug.cgi?id=766137
+    patches/getchannelinfo.patch
+
 Apply the patches to NSS by running the patches/applypatches.sh script.  Read
 the comments at the top of patches/applypatches.sh for instructions.
 
diff --git a/net/third_party/nss/patches/applypatches.sh b/net/third_party/nss/patches/applypatches.sh
index 4ee279d..2cf6f18 100755
--- a/net/third_party/nss/patches/applypatches.sh
+++ b/net/third_party/nss/patches/applypatches.sh
@@ -41,3 +41,5 @@ patch -p4 < $patches_dir/channelid.patch
 patch -p4 < $patches_dir/dtlssrtp.patch
 
 patch -p4 < $patches_dir/keylog.patch
+
+patch -p4 < $patches_dir/getchannelinfo.patch
diff --git a/net/third_party/nss/patches/getchannelinfo.patch b/net/third_party/nss/patches/getchannelinfo.patch
new file mode 100644
index 0000000..530b7fe
--- /dev/null
+++ b/net/third_party/nss/patches/getchannelinfo.patch
@@ -0,0 +1,27 @@
+Index: ssl/sslinfo.c
+===================================================================
+--- ssl/sslinfo.c	(revision 142907)
++++ ssl/sslinfo.c	(working copy)
+@@ -97,11 +97,11 @@
+ 	} else if (ss->ssl3.initialized) { 	/* SSL3 and TLS */
+ 	    ssl_GetSpecReadLock(ss);
+ 	    /* XXX  The cipher suite should be in the specs and this
+-	     * function should get it from crSpec rather than from the "hs".
++	     * function should get it from cwSpec rather than from the "hs".
+ 	     * See bug 275744 comment 69.
+ 	     */
+ 	    inf.cipherSuite           = ss->ssl3.hs.cipher_suite;
+-	    inf.compressionMethod     = ss->ssl3.crSpec->compression_method;
++	    inf.compressionMethod     = ss->ssl3.cwSpec->compression_method;
+ 	    ssl_ReleaseSpecReadLock(ss);
+ 	    inf.compressionMethodName =
+ 		ssl_GetCompressionMethodName(inf.compressionMethod);
+@@ -336,7 +336,7 @@
+             ss->ssl3.initialized) { /* TLS */
+             SECItem *crsName;
+             ssl_GetSpecReadLock(ss); /*********************************/
+-            crsName = &ss->ssl3.crSpec->srvVirtName;
++            crsName = &ss->ssl3.cwSpec->srvVirtName;
+             if (crsName->data) {
+                 sniName = SECITEM_DupItem(crsName);
+             }
diff --git a/net/third_party/nss/ssl/sslinfo.c b/net/third_party/nss/ssl/sslinfo.c
index fe6b6f5..8423938 100644
--- a/net/third_party/nss/ssl/sslinfo.c
+++ b/net/third_party/nss/ssl/sslinfo.c
@@ -97,11 +97,11 @@ SSL_GetChannelInfo(PRFileDesc *fd, SSLChannelInfo *info, PRUintn len)
 	} else if (ss->ssl3.initialized) { 	/* SSL3 and TLS */
 	    ssl_GetSpecReadLock(ss);
 	    /* XXX  The cipher suite should be in the specs and this
-	     * function should get it from crSpec rather than from the "hs".
+	     * function should get it from cwSpec rather than from the "hs".
 	     * See bug 275744 comment 69.
 	     */
 	    inf.cipherSuite           = ss->ssl3.hs.cipher_suite;
-	    inf.compressionMethod     = ss->ssl3.crSpec->compression_method;
+	    inf.compressionMethod     = ss->ssl3.cwSpec->compression_method;
 	    ssl_ReleaseSpecReadLock(ss);
 	    inf.compressionMethodName =
 		ssl_GetCompressionMethodName(inf.compressionMethod);
@@ -336,7 +336,7 @@ SSL_GetNegotiatedHostInfo(PRFileDesc *fd)
             ss->ssl3.initialized) { /* TLS */
             SECItem *crsName;
             ssl_GetSpecReadLock(ss); /*********************************/
-            crsName = &ss->ssl3.crSpec->srvVirtName;
+            crsName = &ss->ssl3.cwSpec->srvVirtName;
             if (crsName->data) {
                 sniName = SECITEM_DupItem(crsName);
             }