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

Unified Diff: patches/nss-aes-gcm.patch

Issue 13327005: PK11_DecryptWithSymKey and PK11_EncryptWithSymKey have been (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: Created 7 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: patches/nss-aes-gcm.patch
===================================================================
--- patches/nss-aes-gcm.patch (revision 190723)
+++ patches/nss-aes-gcm.patch (working copy)
@@ -1,6 +1,6 @@
Index: mozilla/security/nss/lib/freebl/gcm.c
===================================================================
---- mozilla/security/nss/lib/freebl/gcm.c (revision 182578)
+--- mozilla/security/nss/lib/freebl/gcm.c (revision 190722)
+++ mozilla/security/nss/lib/freebl/gcm.c (working copy)
@@ -230,7 +230,7 @@
PORT_SetError(SEC_ERROR_LIBRARY_FAILURE);
@@ -11,7 +11,18 @@
return SECSuccess;
}
-@@ -575,11 +575,11 @@
+@@ -453,7 +453,9 @@
+ * we can hash it */
+ if (ghash->bufLen) {
+ unsigned int needed = PR_MIN(len, blocksize - ghash->bufLen);
+- PORT_Memcpy(ghash->buffer+ghash->bufLen, buf, needed);
++ if (needed != 0) {
++ PORT_Memcpy(ghash->buffer+ghash->bufLen, buf, needed);
++ }
+ buf += needed;
+ len -= needed;
+ ghash->bufLen += needed;
+@@ -575,11 +577,11 @@
if (rv != SECSuccess) {
return SECFailure;
}
@@ -27,9 +38,18 @@
return SECSuccess;
}
+@@ -814,7 +816,7 @@
+
+ /* get the authentication block */
+ if (inlen < tagBytes) {
+- PORT_SetError(SEC_ERROR_INVALID_ARGS);
++ PORT_SetError(SEC_ERROR_INPUT_LEN);
+ return SECFailure;
+ }
+
Index: mozilla/security/nss/lib/freebl/rijndael.c
===================================================================
---- mozilla/security/nss/lib/freebl/rijndael.c (revision 182578)
+--- mozilla/security/nss/lib/freebl/rijndael.c (revision 190722)
+++ mozilla/security/nss/lib/freebl/rijndael.c (working copy)
@@ -1221,7 +1221,7 @@
{
@@ -51,7 +71,7 @@
}
Index: mozilla/security/nss/lib/pk11wrap/pk11mech.c
===================================================================
---- mozilla/security/nss/lib/pk11wrap/pk11mech.c (revision 182578)
+--- mozilla/security/nss/lib/pk11wrap/pk11mech.c (revision 190722)
+++ mozilla/security/nss/lib/pk11wrap/pk11mech.c (working copy)
@@ -221,6 +221,10 @@
return CKK_CAMELLIA;

Powered by Google App Engine
This is Rietveld 408576698