From 15cceaad90dc5fa761da4dbf109aea15fea5d36e Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Fri, 9 Dec 2022 21:29:33 +0100 Subject: [PATCH] MSVC compat --- src/libsodium/crypto_core/softaes/softaes.c | 22 +++++++++---------- .../include/sodium/private/softaes.h | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/libsodium/crypto_core/softaes/softaes.c b/src/libsodium/crypto_core/softaes/softaes.c index 385a103f..4aa03e08 100644 --- a/src/libsodium/crypto_core/softaes/softaes.c +++ b/src/libsodium/crypto_core/softaes/softaes.c @@ -48,11 +48,11 @@ static const uint32_t LUT[256] = { static SoftAesBlock _encrypt(const uint8_t ix0[4], const uint8_t ix1[4], const uint8_t ix2[4], const uint8_t ix3[4]) { - CRYPTO_ALIGN(64) uint32_t t[4][4][256 / SOFTAES_STRIDE]; - CRYPTO_ALIGN(64) uint8_t of[4][4]; - SoftAesBlock out; - size_t i; - size_t j; + CRYPTO_ALIGN(64) uint32_t t[4][4][256 / SOFTAES_STRIDE]; + CRYPTO_ALIGN(64) uint8_t of[4][4]; + CRYPTO_ALIGN(64) SoftAesBlock out; + size_t i; + size_t j; for (j = 0; j < 4; j++) { of[j][0] = ix0[j] % SOFTAES_STRIDE; @@ -99,12 +99,12 @@ _encrypt(const uint8_t ix0[4], const uint8_t ix1[4], const uint8_t ix2[4], const SoftAesBlock softaes_block_encrypt(const SoftAesBlock block, const SoftAesBlock rk) { - SoftAesBlock out; - CRYPTO_ALIGN(64) uint8_t ix0[4], ix1[4], ix2[4], ix3[4]; - const uint32_t s0 = block.w0; - const uint32_t s1 = block.w1; - const uint32_t s2 = block.w2; - const uint32_t s3 = block.w3; + CRYPTO_ALIGN(64) SoftAesBlock out; + CRYPTO_ALIGN(64) uint8_t ix0[4], ix1[4], ix2[4], ix3[4]; + const uint32_t s0 = block.w0; + const uint32_t s1 = block.w1; + const uint32_t s2 = block.w2; + const uint32_t s3 = block.w3; ix0[0] = (uint8_t) s0; ix0[1] = (uint8_t) s1; diff --git a/src/libsodium/include/sodium/private/softaes.h b/src/libsodium/include/sodium/private/softaes.h index 863219e7..f7a2bd24 100644 --- a/src/libsodium/include/sodium/private/softaes.h +++ b/src/libsodium/include/sodium/private/softaes.h @@ -5,7 +5,7 @@ #include "private/common.h" -typedef struct CRYPTO_ALIGN(64) SoftAesBlock { +typedef struct SoftAesBlock { uint32_t w0; uint32_t w1; uint32_t w2;