From: Andy Polyakov <appro@openssl.org>
Date: Thu, 1 Jun 2017 19:06:26 +0000 (+0200)
Subject: sha/keccak1600.c: add #ifdef KECCAK1600_ASM.
X-Git-Tag: OpenSSL_1_1_1-pre1~1390
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=71dd3b6464df1ba524601c3705e1d1e3c7c5406d;p=oweals%2Fopenssl.git

sha/keccak1600.c: add #ifdef KECCAK1600_ASM.

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

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
 /*