Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(92)

Side by Side Diff: net/third_party/nss/patches/aesgcmchromium.patch

Issue 142283002: Update net/third_party/nss to NSS_3_15_5_BETA2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fix applypatches.sh mistakes Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 diff -pu a/nss/lib/ssl/ssl3con.c b/nss/lib/ssl/ssl3con.c 1 diff -pu a/nss/lib/ssl/ssl3con.c b/nss/lib/ssl/ssl3con.c
2 --- a/nss/lib/ssl/ssl3con.c» 2014-01-03 19:42:10.424660677 -0800 2 --- a/nss/lib/ssl/ssl3con.c» 2014-01-17 18:04:43.127747463 -0800
3 +++ b/nss/lib/ssl/ssl3con.c» 2014-01-03 19:42:18.324789858 -0800 3 +++ b/nss/lib/ssl/ssl3con.c» 2014-01-17 18:06:21.919386088 -0800
4 @@ -44,6 +44,9 @@ 4 @@ -44,6 +44,9 @@
5 #ifdef NSS_ENABLE_ZLIB 5 #ifdef NSS_ENABLE_ZLIB
6 #include "zlib.h" 6 #include "zlib.h"
7 #endif 7 #endif
8 +#ifdef LINUX 8 +#ifdef LINUX
9 +#include <dlfcn.h> 9 +#include <dlfcn.h>
10 +#endif 10 +#endif
11 11
12 #ifndef PK11_SETATTRS 12 #ifndef PK11_SETATTRS
13 #define PK11_SETATTRS(x,id,v,l) (x)->type = (id); \ 13 #define PK11_SETATTRS(x,id,v,l) (x)->type = (id); \
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 if (doDecrypt) { 87 if (doDecrypt) {
88 - rv = PK11_Decrypt(keys->write_key, CKM_AES_GCM, &param, out, &uOutLen, 88 - rv = PK11_Decrypt(keys->write_key, CKM_AES_GCM, &param, out, &uOutLen,
89 + rv = pk11_decrypt(keys->write_key, CKM_AES_GCM, &param, out, &uOutLen, 89 + rv = pk11_decrypt(keys->write_key, CKM_AES_GCM, &param, out, &uOutLen,
90 maxout, in, inlen); 90 maxout, in, inlen);
91 } else { 91 } else {
92 - rv = PK11_Encrypt(keys->write_key, CKM_AES_GCM, &param, out, &uOutLen, 92 - rv = PK11_Encrypt(keys->write_key, CKM_AES_GCM, &param, out, &uOutLen,
93 + rv = pk11_encrypt(keys->write_key, CKM_AES_GCM, &param, out, &uOutLen, 93 + rv = pk11_encrypt(keys->write_key, CKM_AES_GCM, &param, out, &uOutLen,
94 maxout, in, inlen); 94 maxout, in, inlen);
95 } 95 }
96 *outlen += (int) uOutLen; 96 *outlen += (int) uOutLen;
97 @@ -5102,6 +5168,10 @@ ssl3_SendClientHello(sslSocket *ss, PRBo 97 @@ -5103,6 +5169,10 @@ ssl3_SendClientHello(sslSocket *ss, PRBo
98 ssl3_DisableNonDTLSSuites(ss); 98 ssl3_DisableNonDTLSSuites(ss);
99 } 99 }
100 100
101 + if (!ssl3_HasGCMSupport()) { 101 + if (!ssl3_HasGCMSupport()) {
102 + ssl3_DisableGCMSuites(ss); 102 + ssl3_DisableGCMSuites(ss);
103 + } 103 + }
104 + 104 +
105 /* how many suites are permitted by policy and user preference? */ 105 /* how many suites are permitted by policy and user preference? */
106 num_suites = count_cipher_suites(ss, ss->ssl3.policy, PR_TRUE); 106 num_suites = count_cipher_suites(ss, ss->ssl3.policy, PR_TRUE);
107 if (!num_suites) { 107 if (!num_suites) {
108 @@ -8057,6 +8127,10 @@ ssl3_HandleClientHello(sslSocket *ss, SS 108 @@ -8080,6 +8150,10 @@ ssl3_HandleClientHello(sslSocket *ss, SS
109 ssl3_DisableNonDTLSSuites(ss); 109 ssl3_DisableNonDTLSSuites(ss);
110 } 110 }
111 111
112 + if (!ssl3_HasGCMSupport()) { 112 + if (!ssl3_HasGCMSupport()) {
113 + ssl3_DisableGCMSuites(ss); 113 + ssl3_DisableGCMSuites(ss);
114 + } 114 + }
115 + 115 +
116 #ifdef PARANOID 116 #ifdef PARANOID
117 /* Look for a matching cipher suite. */ 117 /* Look for a matching cipher suite. */
118 j = ssl3_config_match_init(ss); 118 j = ssl3_config_match_init(ss);
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698