mirror of
https://github.com/jedisct1/libsodium.git
synced 2024-12-19 01:55:02 -07:00
Use uint64_t sizes in aegis*_mac()
No-op in libsodium for now, but useful if we introduce a streaming API later.
This commit is contained in:
parent
985ad65bfb
commit
584f61dcd4
@ -33,12 +33,12 @@ aegis128l_init(const uint8_t *key, const uint8_t *nonce, aes_block_t *const stat
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
aegis128l_mac(uint8_t *mac, size_t maclen, size_t adlen, size_t mlen, aes_block_t *const state)
|
aegis128l_mac(uint8_t *mac, size_t maclen, uint64_t adlen, uint64_t mlen, aes_block_t *const state)
|
||||||
{
|
{
|
||||||
aes_block_t tmp;
|
aes_block_t tmp;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
tmp = AES_BLOCK_LOAD_64x2(((uint64_t) mlen) << 3, ((uint64_t) adlen) << 3);
|
tmp = AES_BLOCK_LOAD_64x2(mlen << 3, adlen << 3);
|
||||||
tmp = AES_BLOCK_XOR(tmp, state[2]);
|
tmp = AES_BLOCK_XOR(tmp, state[2]);
|
||||||
|
|
||||||
for (i = 0; i < 7; i++) {
|
for (i = 0; i < 7; i++) {
|
||||||
|
@ -35,12 +35,12 @@ aegis256_init(const uint8_t *key, const uint8_t *nonce, aes_block_t *const state
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
aegis256_mac(uint8_t *mac, size_t maclen, size_t adlen, size_t mlen, aes_block_t *const state)
|
aegis256_mac(uint8_t *mac, size_t maclen, uint64_t adlen, uint64_t mlen, aes_block_t *const state)
|
||||||
{
|
{
|
||||||
aes_block_t tmp;
|
aes_block_t tmp;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
tmp = AES_BLOCK_LOAD_64x2(((uint64_t) mlen) << 3, ((uint64_t) adlen) << 3);
|
tmp = AES_BLOCK_LOAD_64x2(mlen << 3, adlen << 3);
|
||||||
tmp = AES_BLOCK_XOR(tmp, state[3]);
|
tmp = AES_BLOCK_XOR(tmp, state[3]);
|
||||||
|
|
||||||
for (i = 0; i < 7; i++) {
|
for (i = 0; i < 7; i++) {
|
||||||
|
Loading…
Reference in New Issue
Block a user