diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2018-04-05 03:30:37 -0400 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-04-05 03:30:46 -0400 |
| commit | 1d3ef3153bd881ecd53de41a909ae70792464690 (patch) | |
| tree | 3c23369b818663a9d507c0f49ea1782b2aff6ff4 | |
| parent | chacha20poly1305: add self tests from wycheproof (diff) | |
| download | wireguard-monolithic-historical-1d3ef3153bd881ecd53de41a909ae70792464690.tar.xz wireguard-monolithic-historical-1d3ef3153bd881ecd53de41a909ae70792464690.zip | |
chacha20poly1305: put magic constant behind macro
| -rw-r--r-- | src/crypto/chacha20poly1305.c | 6 | ||||
| -rw-r--r-- | src/selftest/chacha20poly1305.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/crypto/chacha20poly1305.c b/src/crypto/chacha20poly1305.c index 45825e9..353cdf9 100644 --- a/src/crypto/chacha20poly1305.c +++ b/src/crypto/chacha20poly1305.c @@ -154,6 +154,8 @@ struct chacha20_ctx { DOUBLE_ROUND(x) \ ) +#define EXPAND_32_BYTE_K 0x61707865, 0x3320646e, 0x79622d32, 0x6b206574 + static void chacha20_block_generic(struct chacha20_ctx *ctx, __le32 *stream) { u32 x[CHACHA20_BLOCK_SIZE / sizeof(u32)]; @@ -174,7 +176,7 @@ static void hchacha20_generic(u8 derived_key[CHACHA20POLY1305_KEYLEN], const u8 { __le32 *out = (__force __le32 *)derived_key; u32 x[] = { - 0x61707865, 0x3320646e, 0x79622d32, 0x6b206574, + EXPAND_32_BYTE_K, le32_to_cpuvp(key + 0), le32_to_cpuvp(key + 4), le32_to_cpuvp(key + 8), le32_to_cpuvp(key + 12), le32_to_cpuvp(key + 16), le32_to_cpuvp(key + 20), le32_to_cpuvp(key + 24), le32_to_cpuvp(key + 28), le32_to_cpuvp(nonce + 0), le32_to_cpuvp(nonce + 4), le32_to_cpuvp(nonce + 8), le32_to_cpuvp(nonce + 12) @@ -205,7 +207,7 @@ static inline void hchacha20(u8 derived_key[CHACHA20POLY1305_KEYLEN], const u8 n } #define chacha20_initial_state(key, nonce) {{ \ - 0x61707865, 0x3320646e, 0x79622d32, 0x6b206574, \ + EXPAND_32_BYTE_K, \ le32_to_cpuvp((key) + 0), le32_to_cpuvp((key) + 4), le32_to_cpuvp((key) + 8), le32_to_cpuvp((key) + 12), \ le32_to_cpuvp((key) + 16), le32_to_cpuvp((key) + 20), le32_to_cpuvp((key) + 24), le32_to_cpuvp((key) + 28), \ 0, 0, le32_to_cpuvp((nonce) + 0), le32_to_cpuvp((nonce) + 4) \ diff --git a/src/selftest/chacha20poly1305.h b/src/selftest/chacha20poly1305.h index 294eeea..a6a5598 100644 --- a/src/selftest/chacha20poly1305.h +++ b/src/selftest/chacha20poly1305.h @@ -1279,7 +1279,7 @@ static inline void chacha20poly1305_selftest_encrypt_bignonce(u8 *dst, const u8 __le64 len; struct poly1305_ctx poly1305_state; struct chacha20_ctx chacha20_state = {{ - 0x61707865, 0x3320646e, 0x79622d32, 0x6b206574, + EXPAND_32_BYTE_K, le32_to_cpuvp(key + 0), le32_to_cpuvp(key + 4), le32_to_cpuvp(key + 8), le32_to_cpuvp(key + 12), le32_to_cpuvp(key + 16), le32_to_cpuvp(key + 20), le32_to_cpuvp(key + 24), le32_to_cpuvp(key + 28), 0, le32_to_cpuvp(nonce + 0), le32_to_cpuvp(nonce + 4), le32_to_cpuvp(nonce + 8) |