summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Relyea <rrelyea@redhat.com>2015-09-04 16:14:02 -0700
committerRobert Relyea <rrelyea@redhat.com>2015-09-04 16:14:02 -0700
commit32af8332997487e0d127b2c6a1ea81703f4f805c (patch)
tree45190caaa4b42cb0d73a8b4196142ba4fbc862c5
parentcffba43ccff1e2dafd0fb02a469144ff6f4ba3e1 (diff)
downloadnss-hg-32af8332997487e0d127b2c6a1ea81703f4f805c.tar.gz
Fix PR_STATIC_ASSERT compile errors in Windows.
-rw-r--r--lib/freebl/rijndael.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/freebl/rijndael.c b/lib/freebl/rijndael.c
index f775fad90..40c8c45be 100644
--- a/lib/freebl/rijndael.c
+++ b/lib/freebl/rijndael.c
@@ -1288,6 +1288,7 @@ 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
@@ -1304,6 +1305,7 @@ 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);