QPQ-AG/libsodium
12
0
Fork 0
mirror of https://github.com/jedisct1/libsodium.git synced 2026-08-25 08:37:13 +09:00
Code Issues Packages Projects Releases Wiki Activity

aegis mac: flip parameters to match their representation order

Browse Source
This commit is contained in:
Frank Denis
2020-09-27 23:38:02 +02:00
parent 3c83aeb4fa
commit 3993b1a682
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsodium/crypto_aead/aegis128l/aesni/aead_aegis128l_aesni.c
+3 -3
View File
@@ -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);
src/libsodium/crypto_aead/aegis128l/armcrypto/aead_aegis128l_armcrypto.c
+4 -4
View File
@@ -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);
src/libsodium/crypto_aead/aegis256/aesni/aead_aegis256_aesni.c
+3 -3
View File
@@ -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);
src/libsodium/crypto_aead/aegis256/armcrypto/aead_aegis256_armcrypto.c
+4 -4
View File
@@ -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);