Index: mozilla/security/nss/lib/freebl/rijndael.c |
=================================================================== |
--- mozilla/security/nss/lib/freebl/rijndael.c (revision 182578) |
+++ mozilla/security/nss/lib/freebl/rijndael.c (working copy) |
@@ -1221,7 +1221,7 @@ |
{ |
int blocksize; |
/* Check args */ |
- if (cx == NULL || output == NULL || input == NULL) { |
+ if (cx == NULL || output == NULL || (input == NULL && inputLen != 0)) { |
wtc
2013/03/26 18:24:46
These changes allow an empty input to be represent
Ryan Sleevi
2013/03/26 18:39:14
I checked the PKCS#11 2.30 specs, and this seems v
|
PORT_SetError(SEC_ERROR_INVALID_ARGS); |
return SECFailure; |
} |
@@ -1252,7 +1252,7 @@ |
{ |
int blocksize; |
/* Check args */ |
- if (cx == NULL || output == NULL || input == NULL) { |
+ if (cx == NULL || output == NULL || (input == NULL && inputLen != 0)) { |
PORT_SetError(SEC_ERROR_INVALID_ARGS); |
return SECFailure; |
} |