From c363ce55f2a04124519e504bbe1706f858260805 Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Sun, 16 Jul 2017 23:36:54 +0200 Subject: [PATCH 1/1] sha/keccak1600.c: build and make it work with strict warnings. Reviewed-by: Paul Dale Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/3943) --- crypto/sha/build.info | 3 ++- crypto/sha/keccak1600.c | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/crypto/sha/build.info b/crypto/sha/build.info index 4b3225bfe3..7686f9fd62 100644 --- a/crypto/sha/build.info +++ b/crypto/sha/build.info @@ -1,6 +1,7 @@ LIBS=../../libcrypto SOURCE[../../libcrypto]=\ - sha1dgst.c sha1_one.c sha256.c sha512.c {- $target{sha1_asm_src} -} + sha1dgst.c sha1_one.c sha256.c sha512.c {- $target{sha1_asm_src} -} \ + keccak1600.c GENERATE[sha1-586.s]=asm/sha1-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(PROCESSOR) DEPEND[sha1-586.s]=../perlasm/x86asm.pl diff --git a/crypto/sha/keccak1600.c b/crypto/sha/keccak1600.c index 0ea9818059..7ff4ff85d3 100644 --- a/crypto/sha/keccak1600.c +++ b/crypto/sha/keccak1600.c @@ -11,6 +11,10 @@ #include #include +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); + #ifndef KECCAK1600_ASM #if defined(__x86_64__) || defined(__aarch64__) || \ -- 2.34.1