diff options
author | Andy Polyakov <appro@openssl.org> | 2017-07-31 15:20:41 +0200 |
---|---|---|
committer | Andy Polyakov <appro@openssl.org> | 2017-08-01 22:42:35 +0200 |
commit | 5d010e3f10282c7bbc375ec593615c8015fbf836 (patch) | |
tree | c9a1ec11ee73ceffa4b0f42687b088487d7a0056 /crypto | |
parent | b7e011f8b6cf0dc5078932ebc3c06196b37e2a4c (diff) |
sha/keccak1600.c: choose more sensible default parameters.
"More" refers to the fact that we make active BIT_INTERLEAVE choice
in some specific cases. Update commentary correspondingly.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/sha/keccak1600.c | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/crypto/sha/keccak1600.c b/crypto/sha/keccak1600.c index 7ff4ff85d3..d925734a17 100644 --- a/crypto/sha/keccak1600.c +++ b/crypto/sha/keccak1600.c @@ -15,7 +15,19 @@ 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(KECCAK1600_ASM) || !defined(SELFTEST) + +/* + * Choose some sensible defaults + */ +#if !defined(KECCAK_REF) && !defined(KECCAK_1X) && !defined(KECCAK_1X_ALT) && \ + !defined(KECCAK_2X) && !defined(KECCAK_INPLACE) +# define KECCAK_2X /* default to KECCAK_2X variant */ +#endif + +#if defined(__i386) || defined(__i386__) || defined(_M_IX86) +# define KECCAK_COMPLEMENTING_TRANSFORM +#endif #if defined(__x86_64__) || defined(__aarch64__) || \ defined(__mips64) || defined(__ia64) || \ @@ -508,10 +520,10 @@ static void KeccakF1600(uint64_t A[5][5]) * This implementation is variant of KECCAK_1X above with outer-most * round loop unrolled twice. This allows to take temporary storage * out of round procedure and simplify references to it by alternating - * it with actual data (see round loop below). Just like original, it's - * rather meant as reference for an assembly implementation. It's likely - * to provide best instruction per processed byte ratio at minimal - * round unroll factor... + * it with actual data (see round loop below). Originally it was meant + * rather as reference for an assembly implementation, but it seems to + * play best with compilers [as well as provide best instruction per + * processed byte ratio at minimal round unroll factor]... */ static void Round(uint64_t R[5][5], uint64_t A[5][5], size_t i) { @@ -661,13 +673,15 @@ static void KeccakF1600(uint64_t A[5][5]) #endif } -#else +#else /* define KECCAK_INPLACE to compile this code path */ /* * This implementation is KECCAK_1X from above combined 4 times with * a twist that allows to omit temporary storage and perform in-place * processing. It's discussed in section 2.5 of "Keccak implementation * overview". It's likely to be best suited for processors with large - * register bank... + * register bank... On the other hand processor with large register + * bank can as well use KECCAK_1X_ALT, it would be as fast but much + * more compact... */ static void FourRounds(uint64_t A[5][5], size_t i) { @@ -1106,10 +1120,6 @@ void SHA3_squeeze(uint64_t A[5][5], unsigned char *out, size_t len, size_t r) KeccakF1600(A); } } -#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 |