Fixes PR comment & exposes common Keccak for AVX2

This commit is contained in:
Michael Baentsch 2020-04-07 08:15:52 +02:00
parent a59efcdf5a
commit 2ab3e54b74
3 changed files with 2 additions and 4 deletions

View File

@ -412,7 +412,7 @@ static ALIGN(KeccakP1600times4_statesAlignment) const UINT64 KeccakF1600RoundCon
#endif
#include "KeccakP-1600-unrolling.macros"
static void KeccakP1600times4_PermuteAll_24rounds(void *states) {
void KeccakP1600times4_PermuteAll_24rounds(void *states) {
V256 *statesAsLanes = (V256 *) states;
declareABCDE
#ifndef KeccakP1600times4_fullUnrolling

View File

@ -34,6 +34,6 @@ http://creativecommons.org/publicdomain/zero/1.0/
#define KeccakP1600times4_StaticInitialize()
#define KeccakP1600times4_AddByte(states, instanceIndex, byte, offset) \
((unsigned char *) (states))[(instanceIndex) *8 + ((offset) / 8) * 4 * 8 + (offset) % 8] ^= (byte)
static void KeccakP1600times4_PermuteAll_24rounds(void *states);
void KeccakP1600times4_PermuteAll_24rounds(void *states);
#endif

View File

@ -43,8 +43,6 @@ static OQS_STATUS sig_speed_wrapper(const char *method_name, uint64_t duration,
printf("%-30s | %10s | %14s | %15s | %10s | %25s | %10s\n", sig->method_name, "", "", "", "", "", "");
TIME_OPERATION_SECONDS(OQS_SIG_keypair(sig, public_key, secret_key), "keypair", duration)
TIME_OPERATION_SECONDS(OQS_SIG_sign(sig, signature, &signature_len, message, message_len, secret_key), "sign", duration)
//message[0]=0;
// printf("verify result = %d\n", OQS_SIG_verify(sig, message, message_len, signature, signature_len, public_key));
TIME_OPERATION_SECONDS(OQS_SIG_verify(sig, message, message_len, signature, signature_len, public_key), "verify", duration)
if (printInfo) {