Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

keccak: remove aligned check 

Some tools report the alignment check as UB, which seems a bit
dubious, but since the performance difference between the two
versions is minimal, I'll go with the safe version
This commit is contained in:
moneromooo-monero 2020-05-16 12:27:22 +00:00
parent 77a008f714
commit 7178bb5c84
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/crypto/keccak.c
View File

@ -146,7 +146,6 @@ void keccak1600(const uint8_t *in, size_t inlen, uint8_t *md)
#define KECCAK_BLOCKLEN 136 #define KECCAK_BLOCKLEN 136
#define KECCAK_WORDS 17 #define KECCAK_WORDS 17
#define KECCAK_DIGESTSIZE 32 #define KECCAK_DIGESTSIZE 32
#define IS_ALIGNED_64(p) (0 == (7 & ((const char*)(p) - (const char*)0)))
#define KECCAK_PROCESS_BLOCK(st, block) { \ #define KECCAK_PROCESS_BLOCK(st, block) { \
for (int i_ = 0; i_ < KECCAK_WORDS; i_++){ \ for (int i_ = 0; i_ < KECCAK_WORDS; i_++){ \
((st))[i_] ^= swap64le(((block))[i_]); \ ((st))[i_] ^= swap64le(((block))[i_]); \
@ -178,17 +177,10 @@ void keccak_update(KECCAK_CTX * ctx, const uint8_t *in, size_t inlen){
inlen -= left; inlen -= left;
} }
const bool is_aligned = IS_ALIGNED_64(in);
while (inlen >= KECCAK_BLOCKLEN) { while (inlen >= KECCAK_BLOCKLEN) {
const uint64_t* aligned_message_block; memcpy(ctx->message, in, KECCAK_BLOCKLEN);
if (is_aligned) {
aligned_message_block = (uint64_t*)in;
} else {
memcpy(ctx->message, in, KECCAK_BLOCKLEN);
aligned_message_block = ctx->message;
}
KECCAK_PROCESS_BLOCK(ctx->hash, aligned_message_block); KECCAK_PROCESS_BLOCK(ctx->hash, ctx->message);
in += KECCAK_BLOCKLEN; in += KECCAK_BLOCKLEN;
inlen -= KECCAK_BLOCKLEN; inlen -= KECCAK_BLOCKLEN;
} }