commit 4a5982813f940a3b16479dfdaa402b9229d4e23d
author David Benjamin <davidben@chromium.org> Sun May 10 01:50:11 2015 -0400
committer Adam Langley <agl@google.com> Mon May 11 19:17:10 2015 +0000
tree 15c35c78d91502f0113788cf25a9a069192659d3
parent bc1fde3206c836226ec196d7772847b84a2cefed

Fix asserts in CRYPTO_ctr128_encrypt_ctr32.

NULL in and out are legal in the degenerate case when len is 0.

Change-Id: Ibf0600a4f635a03103b1ae914918fdcf23a75a39
Reviewed-on: https://boringssl-review.googlesource.com/4705
Reviewed-by: Adam Langley <agl@google.com>

crypto/modes/ctr.c

diff --git a/crypto/modes/ctr.c b/crypto/modes/ctr.c
index a5a3589..306b6f7 100644
--- a/crypto/modes/ctr.c
+++ b/crypto/modes/ctr.c
@@ -163,7 +163,8 @@
                                  unsigned int *num, ctr128_f func) {
   unsigned int n, ctr32;
 
-  assert(in && out && key && ecount_buf && num);
+  assert(key && ecount_buf && num);
+  assert(len == 0 || (in && out));
   assert(*num < 16);
 
   n = *num;