| OLD | NEW |
|---|
| (Empty) | |
| 1 Index: mozilla/security/nss/lib/freebl/gcm.c |
| 2 =================================================================== |
| 3 --- mozilla/security/nss/lib/freebl/gcm.c (revision 182578) |
| 4 +++ mozilla/security/nss/lib/freebl/gcm.c (working copy) |
| 5 @@ -230,7 +230,7 @@ |
| 6 PORT_SetError(SEC_ERROR_LIBRARY_FAILURE); |
| 7 return SECFailure; |
| 8 } |
| 9 - gcm_reverse(T, X, blocksize); |
| 10 + gcm_reverse(T, tmp_buf, blocksize); |
| 11 return SECSuccess; |
| 12 } |
| 13 |
| 14 @@ -575,11 +575,11 @@ |
| 15 if (rv != SECSuccess) { |
| 16 return SECFailure; |
| 17 } |
| 18 - rv = gcmHash_Sync(ghash, blocksize); |
| 19 - if (rv != SECSuccess) { |
| 20 - return SECFailure; |
| 21 - } |
| 22 } |
| 23 + rv = gcmHash_Sync(ghash, blocksize); |
| 24 + if (rv != SECSuccess) { |
| 25 + return SECFailure; |
| 26 + } |
| 27 return SECSuccess; |
| 28 } |
| 29 |
| 30 Index: mozilla/security/nss/lib/freebl/rijndael.c |
| 31 =================================================================== |
| 32 --- mozilla/security/nss/lib/freebl/rijndael.c (revision 182578) |
| 33 +++ mozilla/security/nss/lib/freebl/rijndael.c (working copy) |
| 34 @@ -1221,7 +1221,7 @@ |
| 35 { |
| 36 int blocksize; |
| 37 /* Check args */ |
| 38 - if (cx == NULL || output == NULL || input == NULL) { |
| 39 + if (cx == NULL || output == NULL || (input == NULL && inputLen != 0)) { |
| 40 PORT_SetError(SEC_ERROR_INVALID_ARGS); |
| 41 return SECFailure; |
| 42 } |
| 43 @@ -1252,7 +1252,7 @@ |
| 44 { |
| 45 int blocksize; |
| 46 /* Check args */ |
| 47 - if (cx == NULL || output == NULL || input == NULL) { |
| 48 + if (cx == NULL || output == NULL || (input == NULL && inputLen != 0)) { |
| 49 PORT_SetError(SEC_ERROR_INVALID_ARGS); |
| 50 return SECFailure; |
| 51 } |
| 52 Index: mozilla/security/nss/lib/pk11wrap/pk11mech.c |
| 53 =================================================================== |
| 54 --- mozilla/security/nss/lib/pk11wrap/pk11mech.c (revision 182578) |
| 55 +++ mozilla/security/nss/lib/pk11wrap/pk11mech.c (working copy) |
| 56 @@ -221,6 +221,10 @@ |
| 57 return CKK_CAMELLIA; |
| 58 case CKM_AES_ECB: |
| 59 case CKM_AES_CBC: |
| 60 + case CKM_AES_CCM: |
| 61 + case CKM_AES_CTR: |
| 62 + case CKM_AES_CTS: |
| 63 + case CKM_AES_GCM: |
| 64 case CKM_AES_MAC: |
| 65 case CKM_AES_MAC_GENERAL: |
| 66 case CKM_AES_CBC_PAD: |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 12668022:
Make CKM_AES_GCM usable. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/