summaryrefslogtreecommitdiffstats
path: root/net/third_party/nss/patches/aes256keylength.patch
diff options
context:
space:
mode:
authorjoaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-29 13:00:01 +0000
committerjoaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-29 13:00:01 +0000
commit8fc73c77bef5950266756a691b90b5d1a6b4ee67 (patch)
tree4f83f8fac6584572a90dd9fb270e92fb131ee076 /net/third_party/nss/patches/aes256keylength.patch
parent06c3261f668bf413e8f85e4a26593f970cac700a (diff)
downloadchromium_src-8fc73c77bef5950266756a691b90b5d1a6b4ee67.zip
chromium_src-8fc73c77bef5950266756a691b90b5d1a6b4ee67.tar.gz
chromium_src-8fc73c77bef5950266756a691b90b5d1a6b4ee67.tar.bz2
Revert 209278 "Update dependency to NSS >= 3.14.3 and NSPR >= 4.9.2"
> Update dependency to NSS >= 3.14.3 and NSPR >= 4.9.2 > > Technically NSS 3.14.3 depends on NSPR 4.9.5, but Debian stable still > ships 4.9.2 on stable, so this is the lower bound. > > 3.14.3 contains a number of important security fixes, and support for > older systems is no longer desirable. > > BUG=245370 > R=thestig@chromium.org, wtc@chromium.org > > Review URL: https://chromiumcodereview.appspot.com/18063013 TBR=rsleevi@chromium.org Review URL: https://codereview.chromium.org/18181019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209282 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/third_party/nss/patches/aes256keylength.patch')
-rw-r--r--net/third_party/nss/patches/aes256keylength.patch15
1 files changed, 15 insertions, 0 deletions
diff --git a/net/third_party/nss/patches/aes256keylength.patch b/net/third_party/nss/patches/aes256keylength.patch
new file mode 100644
index 0000000..e77e16e
--- /dev/null
+++ b/net/third_party/nss/patches/aes256keylength.patch
@@ -0,0 +1,15 @@
+diff -pu a/nss/lib/ssl/sslsnce.c b/nss/lib/ssl/sslsnce.c
+--- a/nss/lib/ssl/sslsnce.c 2013-04-27 09:17:17.216390477 -0700
++++ b/nss/lib/ssl/sslsnce.c 2013-04-27 09:41:36.887048239 -0700
+@@ -87,6 +87,11 @@
+ #include "nspr.h"
+ #include "sslmutex.h"
+
++/* AES_256_KEY_LENGTH was added to blapit.h in NSS 3.12.10. */
++#ifndef AES_256_KEY_LENGTH
++#define AES_256_KEY_LENGTH 32 /* bytes */
++#endif
++
+ /*
+ ** Format of a cache entry in the shared memory.
+ */