[openssl-commits] [openssl] master update
Andy Polyakov
appro at openssl.org
Mon Oct 31 21:18:42 UTC 2016
The branch master has been updated
via 4b90430148447ff06f993ed6fec2367183c79f6b (commit)
from ca1574cec20589885000d039eed3a9375fb29a0d (commit)
- Log -----------------------------------------------------------------
commit 4b90430148447ff06f993ed6fec2367183c79f6b
Author: Andy Polyakov <appro at openssl.org>
Date: Mon Oct 24 16:05:31 2016 +0200
sha/keccak1600.c: add couple of soft asserts.
Reviewed-by: Richard Levitte <levitte at openssl.org>
-----------------------------------------------------------------------
Summary of changes:
crypto/sha/keccak1600.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/crypto/sha/keccak1600.c b/crypto/sha/keccak1600.c
index 4397372..9e08c50 100644
--- a/crypto/sha/keccak1600.c
+++ b/crypto/sha/keccak1600.c
@@ -167,6 +167,8 @@ size_t SHA3_absorb(uint64_t A[5][5], const unsigned char *inp, size_t len,
uint64_t *A_flat = (uint64_t *)A;
size_t i, w = r / 8;
+ assert(r < (25 * sizeof(A[0][0])) && (r % 8) == 0);
+
while (len >= r) {
for (i = 0; i < w; i++) {
A_flat[i] ^= (uint64_t)inp[0] | (uint64_t)inp[1] << 8 |
@@ -191,6 +193,8 @@ void SHA3_squeeze(uint64_t A[5][5], unsigned char *out, size_t len, size_t r)
uint64_t *A_flat = (uint64_t *)A;
size_t i, rem, w = r / 8;
+ assert(r < (25 * sizeof(A[0][0])) && (r % 8) == 0);
+
while (len >= r) {
for (i = 0; i < w; i++) {
uint64_t Ai = A_flat[i];
More information about the openssl-commits
mailing list