From 6190478f9c8eddd1e526946df332a17be2756864 Mon Sep 17 00:00:00 2001 From: "Matthias J. Kannwischer" Date: Thu, 11 Apr 2024 21:39:26 +0800 Subject: [PATCH] fix compiler errors in Keccak tests --- asm/manual/keccak_f1600/keccak_f1600_variants.h | 2 +- asm/manual/keccak_f1600/third_party/keccakx2_cothan.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/asm/manual/keccak_f1600/keccak_f1600_variants.h b/asm/manual/keccak_f1600/keccak_f1600_variants.h index 400e90f..ded7aa0 100644 --- a/asm/manual/keccak_f1600/keccak_f1600_variants.h +++ b/asm/manual/keccak_f1600/keccak_f1600_variants.h @@ -47,7 +47,7 @@ void keccak_f1600_x2_scalar_C ( uint64_t state[KECCAK_F1600_X2_STATE_SIZE_UI void keccak_f1600_x2_bas ( uint64_t state[KECCAK_F1600_X2_STATE_SIZE_UINT64] ); #include typedef uint64x2_t v128; -void keccak_f1600_x2_neon_C_cothan( v128 state[25] ); +void keccak_f1600_x2_neon_C_cothan( uint64_t stateu64[2*25] ); /* PQAX implementations */ void keccak_f1600_x2_v84a_asm_v1( uint64_t state[KECCAK_F1600_X2_STATE_SIZE_UINT64] ); diff --git a/asm/manual/keccak_f1600/third_party/keccakx2_cothan.c b/asm/manual/keccak_f1600/third_party/keccakx2_cothan.c index 42a1433..4b40055 100644 --- a/asm/manual/keccak_f1600/third_party/keccakx2_cothan.c +++ b/asm/manual/keccak_f1600/third_party/keccakx2_cothan.c @@ -135,8 +135,9 @@ static const uint64_t neon_KeccakF_RoundConstants[NROUNDS] = { * * Arguments: - v128 *state: pointer to input/output Keccak state **************************************************/ -void keccak_f1600_x2_neon_C_cothan(v128 state[25]) +void keccak_f1600_x2_neon_C_cothan(uint64_t stateu64[2*25]) { + v128 *state = (v128 *) stateu64; v128 Aba, Abe, Abi, Abo, Abu; v128 Aga, Age, Agi, Ago, Agu; v128 Aka, Ake, Aki, Ako, Aku;