diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2018-09-24 21:25:13 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-09-25 03:01:21 +0200 |
| commit | 56c4ea978af3991a404c72d4358d40483922cd09 (patch) | |
| tree | c2c586e488272b324541c0805bd9e05118f32aa3 /src/crypto/zinc/chacha20poly1305.c | |
| parent | chacha20-arm: remove unused preambles (diff) | |
| download | wireguard-monolithic-historical-56c4ea978af3991a404c72d4358d40483922cd09.tar.xz wireguard-monolithic-historical-56c4ea978af3991a404c72d4358d40483922cd09.zip | |
hchacha20: keep in native endian in words
Diffstat (limited to 'src/crypto/zinc/chacha20poly1305.c')
| -rw-r--r-- | src/crypto/zinc/chacha20poly1305.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/crypto/zinc/chacha20poly1305.c b/src/crypto/zinc/chacha20poly1305.c index 2003cb1..f2d82a1 100644 --- a/src/crypto/zinc/chacha20poly1305.c +++ b/src/crypto/zinc/chacha20poly1305.c @@ -305,13 +305,14 @@ void xchacha20poly1305_encrypt(u8 *dst, const u8 *src, const size_t src_len, const u8 key[CHACHA20POLY1305_KEYLEN]) { simd_context_t simd_context; - u8 derived_key[CHACHA20POLY1305_KEYLEN] __aligned(16); + u32 derived_key[CHACHA20_KEY_WORDS] __aligned(16); simd_get(&simd_context); hchacha20(derived_key, nonce, key, &simd_context); + cpu_to_le32_array(derived_key, ARRAY_SIZE(derived_key)); __chacha20poly1305_encrypt(dst, src, src_len, ad, ad_len, get_unaligned_le64(nonce + 16), - derived_key, &simd_context); + (u8 *)derived_key, &simd_context); memzero_explicit(derived_key, CHACHA20POLY1305_KEYLEN); simd_put(&simd_context); } @@ -324,13 +325,14 @@ bool xchacha20poly1305_decrypt(u8 *dst, const u8 *src, const size_t src_len, { bool ret; simd_context_t simd_context; - u8 derived_key[CHACHA20POLY1305_KEYLEN] __aligned(16); + u32 derived_key[CHACHA20_KEY_WORDS] __aligned(16); simd_get(&simd_context); hchacha20(derived_key, nonce, key, &simd_context); + cpu_to_le32_array(derived_key, ARRAY_SIZE(derived_key)); ret = __chacha20poly1305_decrypt(dst, src, src_len, ad, ad_len, get_unaligned_le64(nonce + 16), - derived_key, &simd_context); + (u8 *)derived_key, &simd_context); memzero_explicit(derived_key, CHACHA20POLY1305_KEYLEN); simd_put(&simd_context); return ret; |