From 3993b1a682346b3f4a25774fe73092ece6ac3d22 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Sun, 27 Sep 2020 23:38:02 +0200 Subject: [PATCH] aegis mac: flip parameters to match their representation order --- .../crypto_aead/aegis128l/aesni/aead_aegis128l_aesni.c | 6 +++--- .../aegis128l/armcrypto/aead_aegis128l_armcrypto.c | 8 ++++---- .../crypto_aead/aegis256/aesni/aead_aegis256_aesni.c | 6 +++--- .../aegis256/armcrypto/aead_aegis256_armcrypto.c | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/libsodium/crypto_aead/aegis128l/aesni/aead_aegis128l_aesni.c b/src/libsodium/crypto_aead/aegis128l/aesni/aead_aegis128l_aesni.c index a4fdcb1b..2ff40573 100644 --- a/src/libsodium/crypto_aead/aegis128l/aesni/aead_aegis128l_aesni.c +++ b/src/libsodium/crypto_aead/aegis128l/aesni/aead_aegis128l_aesni.c @@ -74,7 +74,7 @@ crypto_aead_aegis128l_init(const unsigned char *key, const unsigned char *nonce, } static void -crypto_aead_aegis128l_mac(unsigned char *mac, unsigned long long mlen, unsigned long long adlen, +crypto_aead_aegis128l_mac(unsigned char *mac, unsigned long long adlen, unsigned long long mlen, __m128i *const state) { __m128i tmp; @@ -171,7 +171,7 @@ crypto_aead_aegis128l_encrypt_detached(unsigned char *c, unsigned char *mac, memcpy(c + i, dst, mlen & 0x1f); } - crypto_aead_aegis128l_mac(mac, mlen, adlen, state); + crypto_aead_aegis128l_mac(mac, adlen, mlen, state); sodium_memzero(state, sizeof state); sodium_memzero(src, sizeof src); sodium_memzero(dst, sizeof dst); @@ -254,7 +254,7 @@ crypto_aead_aegis128l_decrypt_detached(unsigned char *m, unsigned char *nsec, co _mm_loadu_si128((const __m128i *) (const void *) (dst + 16))); } - crypto_aead_aegis128l_mac(computed_mac, mlen, adlen, state); + crypto_aead_aegis128l_mac(computed_mac, adlen, mlen, state); sodium_memzero(state, sizeof state); sodium_memzero(src, sizeof src); sodium_memzero(dst, sizeof dst); diff --git a/src/libsodium/crypto_aead/aegis128l/armcrypto/aead_aegis128l_armcrypto.c b/src/libsodium/crypto_aead/aegis128l/armcrypto/aead_aegis128l_armcrypto.c index ff28d601..4de148b2 100644 --- a/src/libsodium/crypto_aead/aegis128l/armcrypto/aead_aegis128l_armcrypto.c +++ b/src/libsodium/crypto_aead/aegis128l/armcrypto/aead_aegis128l_armcrypto.c @@ -72,8 +72,8 @@ crypto_aead_aegis128l_init(const unsigned char *key, const unsigned char *nonce, } static void -crypto_aead_aegis128l_mac(unsigned char *mac, unsigned long long mlen, - unsigned long long adlen, uint8x16_t *const state) +crypto_aead_aegis128l_mac(unsigned char *mac, unsigned long long adlen, + unsigned long long mlen, uint8x16_t *const state) { uint8x16_t tmp; int i; @@ -174,7 +174,7 @@ crypto_aead_aegis128l_encrypt_detached(unsigned char *c, unsigned char *mac, memcpy(c + i, dst, mlen & 0x1f); } - crypto_aead_aegis128l_mac(mac, mlen, adlen, state); + crypto_aead_aegis128l_mac(mac, adlen, mlen, state); sodium_memzero(state, sizeof state); sodium_memzero(src, sizeof src); sodium_memzero(dst, sizeof dst); @@ -255,7 +255,7 @@ crypto_aead_aegis128l_decrypt_detached(unsigned char *m, unsigned char *nsec, co state[4] = veorq_u8(state[4], vld1q_u8(dst + 16)); } - crypto_aead_aegis128l_mac(computed_mac, mlen, adlen, state); + crypto_aead_aegis128l_mac(computed_mac, adlen, mlen, state); sodium_memzero(state, sizeof state); sodium_memzero(src, sizeof src); sodium_memzero(dst, sizeof dst); diff --git a/src/libsodium/crypto_aead/aegis256/aesni/aead_aegis256_aesni.c b/src/libsodium/crypto_aead/aegis256/aesni/aead_aegis256_aesni.c index ed0cc882..583ef153 100644 --- a/src/libsodium/crypto_aead/aegis256/aesni/aead_aegis256_aesni.c +++ b/src/libsodium/crypto_aead/aegis256/aesni/aead_aegis256_aesni.c @@ -73,7 +73,7 @@ crypto_aead_aegis256_init(const unsigned char *key, const unsigned char *nonce, } static void -crypto_aead_aegis256_mac(unsigned char *mac, unsigned long long mlen, unsigned long long adlen, +crypto_aead_aegis256_mac(unsigned char *mac, unsigned long long adlen, unsigned long long mlen, __m128i *const state) { __m128i tmp; @@ -161,7 +161,7 @@ crypto_aead_aegis256_encrypt_detached(unsigned char *c, unsigned char *mac, memcpy(c + i, dst, mlen & 0xf); } - crypto_aead_aegis256_mac(mac, mlen, adlen, state); + crypto_aead_aegis256_mac(mac, adlen, mlen, state); sodium_memzero(state, sizeof state); sodium_memzero(src, sizeof src); sodium_memzero(dst, sizeof dst); @@ -242,7 +242,7 @@ crypto_aead_aegis256_decrypt_detached(unsigned char *m, unsigned char *nsec, con _mm_loadu_si128((const __m128i *) (const void *) dst)); } - crypto_aead_aegis256_mac(computed_mac, mlen, adlen, state); + crypto_aead_aegis256_mac(computed_mac, adlen, mlen, state); sodium_memzero(state, sizeof state); sodium_memzero(src, sizeof src); sodium_memzero(dst, sizeof dst); diff --git a/src/libsodium/crypto_aead/aegis256/armcrypto/aead_aegis256_armcrypto.c b/src/libsodium/crypto_aead/aegis256/armcrypto/aead_aegis256_armcrypto.c index 36b7218c..1763b677 100644 --- a/src/libsodium/crypto_aead/aegis256/armcrypto/aead_aegis256_armcrypto.c +++ b/src/libsodium/crypto_aead/aegis256/armcrypto/aead_aegis256_armcrypto.c @@ -70,8 +70,8 @@ crypto_aead_aegis256_init(const unsigned char *key, const unsigned char *nonce, } static void -crypto_aead_aegis256_mac(unsigned char *mac, unsigned long long mlen, - unsigned long long adlen, uint8x16_t *const state) +crypto_aead_aegis256_mac(unsigned char *mac, unsigned long long adlen, + unsigned long long mlen, uint8x16_t *const state) { uint8x16_t tmp; int i; @@ -162,7 +162,7 @@ crypto_aead_aegis256_encrypt_detached(unsigned char *c, unsigned char *mac, memcpy(c + i, dst, mlen & 0xf); } - crypto_aead_aegis256_mac(mac, mlen, adlen, state); + crypto_aead_aegis256_mac(mac, adlen, mlen, state); sodium_memzero(state, sizeof state); sodium_memzero(src, sizeof src); sodium_memzero(dst, sizeof dst); @@ -242,7 +242,7 @@ crypto_aead_aegis256_decrypt_detached(unsigned char *m, unsigned char *nsec, con state[0] = veorq_u8(state[0], vld1q_u8(dst)); } - crypto_aead_aegis256_mac(computed_mac, mlen, adlen, state); + crypto_aead_aegis256_mac(computed_mac, adlen, mlen, state); sodium_memzero(state, sizeof state); sodium_memzero(src, sizeof src); sodium_memzero(dst, sizeof dst);