diff options
| author | Robert Relyea <rrelyea@redhat.com> | 2015-09-04 17:35:37 -0700 |
|---|---|---|
| committer | Robert Relyea <rrelyea@redhat.com> | 2015-09-04 17:35:37 -0700 |
| commit | 1b1ef908703fb1e1a2834caa1e7acf79d3d0b664 (patch) | |
| tree | d74dca0b718204271a9122d0a2e788f8c6b92d81 /lib | |
| parent | 316965c61e02136297f12cfffb91aece8a67beb5 (diff) | |
| download | nss-hg-1b1ef908703fb1e1a2834caa1e7acf79d3d0b664.tar.gz | |
Backout out FIPS checkin
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/freebl/rijndael.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/freebl/rijndael.c b/lib/freebl/rijndael.c index 40c8c45be..f775fad90 100644 --- a/lib/freebl/rijndael.c +++ b/lib/freebl/rijndael.c @@ -1288,7 +1288,6 @@ AES_Encrypt(AESContext *cx, unsigned char *output, return SECFailure; } *outputLen = inputLen; - { /* PR_STATIC_ASSERTS need at the start of a block */ #if UINT_MAX > MP_32BIT_MAX /* * we can guarentee that GSM won't overlfow if we limit the input to @@ -1305,7 +1304,6 @@ AES_Encrypt(AESContext *cx, unsigned char *output, /* if we can't pass in a 32_bit number, then no such check needed */ PR_STATIC_ASSERT(sizeof(unsigned int) <= 4); #endif - } return (*cx->worker)(cx->worker_cx, output, outputLen, maxOutputLen, input, inputLen, blocksize); |