summaryrefslogtreecommitdiffstats
path: root/net/third_party/nss/patches/aes256keylength.patch
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-07 22:57:00 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-07 22:57:00 +0000
commit805acdc8862c0a843f3a27d0ee15d6279a4f3c92 (patch)
treef38cce5c4dd91c0559662c96ee43a2e28104aaa4 /net/third_party/nss/patches/aes256keylength.patch
parent2901975cc78133241b9f46a9a758bbf0506d4362 (diff)
downloadchromium_src-805acdc8862c0a843f3a27d0ee15d6279a4f3c92.zip
chromium_src-805acdc8862c0a843f3a27d0ee15d6279a4f3c92.tar.gz
chromium_src-805acdc8862c0a843f3a27d0ee15d6279a4f3c92.tar.bz2
Reland http://crrev.com/209278
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 TBR=thestig@chromium.org, wtc@chromium.org Review URL: https://chromiumcodereview.appspot.com/20615002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216296 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, 0 insertions, 15 deletions
diff --git a/net/third_party/nss/patches/aes256keylength.patch b/net/third_party/nss/patches/aes256keylength.patch
deleted file mode 100644
index 2fc2506..0000000
--- a/net/third_party/nss/patches/aes256keylength.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -pu a/nss/lib/ssl/sslsnce.c b/nss/lib/ssl/sslsnce.c
---- a/nss/lib/ssl/sslsnce.c 2013-07-31 12:07:10.974699609 -0700
-+++ b/nss/lib/ssl/sslsnce.c 2013-07-31 14:12:33.185058439 -0700
-@@ -86,6 +86,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.
- */