commit 15757cc71cecd99b871b235f22a91e7430c0c7c0
author rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Sat Nov 02 01:59:36 2013
committer rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Sat Nov 02 01:59:36 2013
tree 598631ee6ec7b9d999cb3260382aecd11f5f91f8
parent 6e539c0cefaa2b68a35b32d4a71e298bbc43bb20

Include a fix for NSS bug 934016

BUG=314225
R=wtc@chromium.org, wtc

Review URL: https://codereview.chromium.org/52713015

Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: aea012e2b3ef338cbbe4ef157bdb8469176f16b3

README.chromium

diff --git a/README.chromium b/README.chromium
index 0e6ef5b..4a0f2d3 100644
--- a/README.chromium
+++ b/README.chromium
@@ -135,6 +135,10 @@
     https://bugzilla.mozilla.org/show_bug.cgi?id=713933
     patches/canfalsestart.patch
 
+  * Have the Null Cipher limit output to the maximum allowed
+    https://bugzilla.mozilla.org/show_bug.cgi?id=934016
+    patches/nullcipher_934016.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.
 

patches/applypatches.sh

diff --git a/patches/applypatches.sh b/patches/applypatches.sh
index ec96d22..947cf5e 100755
--- a/patches/applypatches.sh
+++ b/patches/applypatches.sh
@@ -63,3 +63,5 @@
 patch -p4 < $patches_dir/peercertchain2.patch
 
 patch -p4 < $patches_dir/canfalsestart.patch
+
+patch -p4 < $patches_dir/nullcipher_934016.patch

patches/nullcipher_934016.patch

diff --git a/patches/nullcipher_934016.patch b/patches/nullcipher_934016.patch
new file mode 100644
index 0000000..6a4b5c6
--- /dev/null
+++ b/patches/nullcipher_934016.patch
@@ -0,0 +1,16 @@
+diff --git a/net/third_party/nss/ssl/ssl3con.c b/net/third_party/nss/ssl/ssl3con.c
+index 8395f61..8b8b758 100644
+--- a/net/third_party/nss/ssl/ssl3con.c
++++ b/net/third_party/nss/ssl/ssl3con.c
+@@ -859,6 +859,11 @@ static SECStatus
+ Null_Cipher(void *ctx, unsigned char *output, int *outputLen, int maxOutputLen,
+ 	    const unsigned char *input, int inputLen)
+ {
++    if (inputLen > maxOutputLen) {
++        *outputLen = 0;  /* Match PK11_CipherOp in setting outputLen */
++        PORT_SetError(SEC_ERROR_OUTPUT_LEN);
++        return SECFailure;
++    }
+     *outputLen = inputLen;
+     if (input != output)
+ 	PORT_Memcpy(output, input, inputLen);

ssl/ssl3con.c

diff --git a/ssl/ssl3con.c b/ssl/ssl3con.c
index 8395f61..8b8b758 100644
--- a/ssl/ssl3con.c
+++ b/ssl/ssl3con.c
@@ -859,6 +859,11 @@
 Null_Cipher(void *ctx, unsigned char *output, int *outputLen, int maxOutputLen,
 	    const unsigned char *input, int inputLen)
 {
+    if (inputLen > maxOutputLen) {
+        *outputLen = 0;  /* Match PK11_CipherOp in setting outputLen */
+        PORT_SetError(SEC_ERROR_OUTPUT_LEN);
+        return SECFailure;
+    }
     *outputLen = inputLen;
     if (input != output)
 	PORT_Memcpy(output, input, inputLen);