aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2017-06-01 21:06:26 +0200
committerAndy Polyakov <appro@openssl.org>2017-06-05 19:35:41 +0200
commit71dd3b6464df1ba524601c3705e1d1e3c7c5406d (patch)
tree74b2c03ca62c8da482eeaac57b6d2eb3147af841
parent22f9fa6e06305f85b45cf23fc68145d789633641 (diff)
downloadopenssl-71dd3b6464df1ba524601c3705e1d1e3c7c5406d.tar.gz
sha/keccak1600.c: add #ifdef KECCAK1600_ASM.
Reviewed-by: Rich Salz <rsalz@openssl.org>
-rw-r--r--crypto/sha/keccak1600.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/crypto/sha/keccak1600.c b/crypto/sha/keccak1600.c
index af24a5d2ed..2517bc66d8 100644
--- a/crypto/sha/keccak1600.c
+++ b/crypto/sha/keccak1600.c
@@ -11,6 +11,8 @@
#include <string.h>
#include <assert.h>
+#ifndef KECCAK1600_ASM
+
#define ROL32(a, offset) (((a) << (offset)) | ((a) >> ((32 - (offset)) & 31)))
static uint64_t ROL64(uint64_t val, int offset)
@@ -1066,6 +1068,11 @@ void SHA3_squeeze(uint64_t A[5][5], unsigned char *out, size_t len, size_t r)
}
}
}
+#else
+size_t SHA3_absorb(uint64_t A[5][5], const unsigned char *inp, size_t len,
+ size_t r);
+void SHA3_squeeze(uint64_t A[5][5], unsigned char *out, size_t len, size_t r);
+#endif
#ifdef SELFTEST
/*