diff options
| author | Alexander Blair <snipa@jagtech.io> | 2020-07-19 03:38:53 -0700 |
|---|---|---|
| committer | Alexander Blair <snipa@jagtech.io> | 2020-07-19 03:38:53 -0700 |
| commit | bb0241da6edb2e20117c30d369d0b4fed62356f3 (patch) | |
| tree | 71e5360cad383d6a92e35e05478f522abda6b51b /src/crypto | |
| parent | Merge pull request #6537 (diff) | |
| parent | keccak: remove aligned check (diff) | |
| download | monero-bb0241da6edb2e20117c30d369d0b4fed62356f3.tar.xz | |
Merge pull request #6538
7178bb5c8 keccak: remove aligned check (moneromooo-monero)
Diffstat (limited to 'src/crypto')
| -rw-r--r-- | src/crypto/keccak.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/crypto/keccak.c b/src/crypto/keccak.c index 851c70a25..72d472d8a 100644 --- a/src/crypto/keccak.c +++ b/src/crypto/keccak.c @@ -146,7 +146,6 @@ void keccak1600(const uint8_t *in, size_t inlen, uint8_t *md) #define KECCAK_BLOCKLEN 136 #define KECCAK_WORDS 17 #define KECCAK_DIGESTSIZE 32 -#define IS_ALIGNED_64(p) (0 == (7 & ((const char*)(p) - (const char*)0))) #define KECCAK_PROCESS_BLOCK(st, block) { \ for (int i_ = 0; i_ < KECCAK_WORDS; 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; } - const bool is_aligned = IS_ALIGNED_64(in); while (inlen >= KECCAK_BLOCKLEN) { - const uint64_t* aligned_message_block; - if (is_aligned) { - aligned_message_block = (uint64_t*)in; - } else { - memcpy(ctx->message, in, KECCAK_BLOCKLEN); - aligned_message_block = ctx->message; - } + memcpy(ctx->message, in, KECCAK_BLOCKLEN); - KECCAK_PROCESS_BLOCK(ctx->hash, aligned_message_block); + KECCAK_PROCESS_BLOCK(ctx->hash, ctx->message); in += KECCAK_BLOCKLEN; inlen -= KECCAK_BLOCKLEN; } |