kevin/libsodium
1
Fork 0
mirror of https://github.com/jedisct1/libsodium.git synced 2024-12-19 10:05:05 -07:00
Code Releases Wiki Activity

Merge branch 'master' of github.com:jedisct1/libsodium

Browse Source 
* 'master' of github.com:jedisct1/libsodium:
  Fix `buildbase.bat` for ARM64:
  Use uint64_t sizes in aegis*_mac()
This commit is contained in:
Frank Denis 2024-12-09 01:16:56 +01:00
commit bfa6ee6386
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builds/msvc/build/buildbase.bat
View File

@ -93,9 +93,9 @@ ECHO Configuration=StaticRelease
msbuild /m /v:n /p:Configuration=StaticRelease /p:Platform=x64 %solution% >> %log%
IF errorlevel 1 GOTO error
@REM Build ARM64 packages only for Visual studio 19 and later
IF %version% == 16 (
CALL !environment! x86_arm64 > nul
@REM Build ARM64 packages only for Visual studio 2019 and later
IF %version% GEQ 16 (
CALL !environment! ARM64 > nul
ECHO Platform=ARM64
ECHO Configuration=DynDebug

4
src/libsodium/crypto_aead/aegis128l/aegis128l_common.h
View File

@ -33,12 +33,12 @@ aegis128l_init(const uint8_t *key, const uint8_t *nonce, aes_block_t *const stat
}
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;
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]);
for (i = 0; i < 7; i++) {

4
src/libsodium/crypto_aead/aegis256/aegis256_common.h
View File

@ -35,12 +35,12 @@ aegis256_init(const uint8_t *key, const uint8_t *nonce, aes_block_t *const state
}
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;
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]);
for (i = 0; i < 7; i++) {