projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
22f9fa6
)
sha/keccak1600.c: add #ifdef KECCAK1600_ASM.
author
Andy Polyakov
<appro@openssl.org>
Thu, 1 Jun 2017 19:06:26 +0000
(21:06 +0200)
committer
Andy Polyakov
<appro@openssl.org>
Mon, 5 Jun 2017 17:35:41 +0000
(19:35 +0200)
Reviewed-by: Rich Salz <rsalz@openssl.org>
crypto/sha/keccak1600.c
patch
|
blob
|
history
diff --git
a/crypto/sha/keccak1600.c
b/crypto/sha/keccak1600.c
index af24a5d2ed5bee54e82c4bedda8ab20653d90a66..2517bc66d8c019e20c3b758d7d6a2d9dd1e53e07 100644
(file)
--- 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
/*