diff --git a/crypto_aead/asconaead128/opt8/aead.c b/crypto_aead/asconaead128/opt8/aead.c index eb2cb1de2..f525cca44 100644 --- a/crypto_aead/asconaead128/opt8/aead.c +++ b/crypto_aead/asconaead128/opt8/aead.c @@ -25,8 +25,8 @@ forceinline void ascon_loadkey(ascon_key_t* key, const uint8_t* k) { forceinline void ascon_initaead(ascon_state_t* s, const ascon_key_t* key, const uint8_t* npub) { #if CRYPTO_KEYBYTES == 16 - if (ASCON_AEAD_RATE == 8) s->x[0] = ASCON_128_IV; - if (ASCON_AEAD_RATE == 16) s->x[0] = ASCON_128A_IV; + if (ASCON_AEAD_RATE == 8) s->x[0] = U64TOWORD(ASCON_128_IV); + if (ASCON_AEAD_RATE == 16) s->x[0] = U64TOWORD(ASCON_128A_IV); memcpy(s->b[1], key->b[0], 16); #else /* CRYPTO_KEYBYTES == 20 */ s->x[0] = key->x[0] | ASCON_80PQ_IV; diff --git a/crypto_aead/asconaead128/opt8_lowsize/aead.c b/crypto_aead/asconaead128/opt8_lowsize/aead.c index e91033437..6b5279df5 100644 --- a/crypto_aead/asconaead128/opt8_lowsize/aead.c +++ b/crypto_aead/asconaead128/opt8_lowsize/aead.c @@ -25,8 +25,8 @@ forceinline void ascon_loadkey(ascon_key_t* key, const uint8_t* k) { forceinline void ascon_initaead(ascon_state_t* s, const ascon_key_t* key, const uint8_t* npub) { #if CRYPTO_KEYBYTES == 16 - if (ASCON_AEAD_RATE == 8) s->x[0] = ASCON_128_IV; - if (ASCON_AEAD_RATE == 16) s->x[0] = ASCON_128A_IV; + if (ASCON_AEAD_RATE == 8) s->x[0] = U64TOWORD(ASCON_128_IV); + if (ASCON_AEAD_RATE == 16) s->x[0] = U64TOWORD(ASCON_128A_IV); memcpy(s->b[1], key->b[0], 16); #else /* CRYPTO_KEYBYTES == 20 */ s->x[0] = key->x[0] | ASCON_80PQ_IV; diff --git a/crypto_hash/asconhash256/opt8/hash.c b/crypto_hash/asconhash256/opt8/hash.c index fd64b2f08..a9c410a6b 100644 --- a/crypto_hash/asconhash256/opt8/hash.c +++ b/crypto_hash/asconhash256/opt8/hash.c @@ -12,13 +12,13 @@ #ifdef ASCON_HASH_BYTES #if ASCON_HASH_BYTES == 32 && ASCON_HASH_ROUNDS == 12 -#define IV(i) ASCON_HASH_IV##i +#define IV(i) U64TOWORD(ASCON_HASH_IV##i) #elif ASCON_HASH_BYTES == 32 && ASCON_HASH_ROUNDS == 8 -#define IV(i) ASCON_HASHA_IV##i +#define IV(i) U64TOWORD(ASCON_HASHA_IV##i) #elif ASCON_HASH_BYTES == 0 && ASCON_HASH_ROUNDS == 12 -#define IV(i) ASCON_XOF_IV##i +#define IV(i) U64TOWORD(ASCON_XOF_IV##i) #elif ASCON_HASH_BYTES == 0 && ASCON_HASH_ROUNDS == 8 -#define IV(i) ASCON_XOFA_IV##i +#define IV(i) U64TOWORD(ASCON_XOFA_IV##i) #endif forceinline void ascon_inithash(ascon_state_t* s) { diff --git a/crypto_hash/asconhash256/opt8_lowsize/hash.c b/crypto_hash/asconhash256/opt8_lowsize/hash.c index e933041b9..771572b38 100644 --- a/crypto_hash/asconhash256/opt8_lowsize/hash.c +++ b/crypto_hash/asconhash256/opt8_lowsize/hash.c @@ -5,13 +5,13 @@ #include "printstate.h" #if ASCON_HASH_BYTES == 32 && ASCON_HASH_ROUNDS == 12 -#define IV(i) ASCON_HASH_IV##i +#define IV(i) U64TOWORD(ASCON_HASH_IV##i) #elif ASCON_HASH_BYTES == 32 && ASCON_HASH_ROUNDS == 8 -#define IV(i) ASCON_HASHA_IV##i +#define IV(i) U64TOWORD(ASCON_HASHA_IV##i) #elif ASCON_HASH_BYTES == 0 && ASCON_HASH_ROUNDS == 12 -#define IV(i) ASCON_XOF_IV##i +#define IV(i) U64TOWORD(ASCON_XOF_IV##i) #elif ASCON_HASH_BYTES == 0 && ASCON_HASH_ROUNDS == 8 -#define IV(i) ASCON_XOFA_IV##i +#define IV(i) U64TOWORD(ASCON_XOFA_IV##i) #endif forceinline void ascon_inithash(ascon_state_t* s) { diff --git a/crypto_hash/asconxof128/opt8/hash.c b/crypto_hash/asconxof128/opt8/hash.c index fd64b2f08..a9c410a6b 100644 --- a/crypto_hash/asconxof128/opt8/hash.c +++ b/crypto_hash/asconxof128/opt8/hash.c @@ -12,13 +12,13 @@ #ifdef ASCON_HASH_BYTES #if ASCON_HASH_BYTES == 32 && ASCON_HASH_ROUNDS == 12 -#define IV(i) ASCON_HASH_IV##i +#define IV(i) U64TOWORD(ASCON_HASH_IV##i) #elif ASCON_HASH_BYTES == 32 && ASCON_HASH_ROUNDS == 8 -#define IV(i) ASCON_HASHA_IV##i +#define IV(i) U64TOWORD(ASCON_HASHA_IV##i) #elif ASCON_HASH_BYTES == 0 && ASCON_HASH_ROUNDS == 12 -#define IV(i) ASCON_XOF_IV##i +#define IV(i) U64TOWORD(ASCON_XOF_IV##i) #elif ASCON_HASH_BYTES == 0 && ASCON_HASH_ROUNDS == 8 -#define IV(i) ASCON_XOFA_IV##i +#define IV(i) U64TOWORD(ASCON_XOFA_IV##i) #endif forceinline void ascon_inithash(ascon_state_t* s) { diff --git a/crypto_hash/asconxof128/opt8_lowsize/hash.c b/crypto_hash/asconxof128/opt8_lowsize/hash.c index e933041b9..771572b38 100644 --- a/crypto_hash/asconxof128/opt8_lowsize/hash.c +++ b/crypto_hash/asconxof128/opt8_lowsize/hash.c @@ -5,13 +5,13 @@ #include "printstate.h" #if ASCON_HASH_BYTES == 32 && ASCON_HASH_ROUNDS == 12 -#define IV(i) ASCON_HASH_IV##i +#define IV(i) U64TOWORD(ASCON_HASH_IV##i) #elif ASCON_HASH_BYTES == 32 && ASCON_HASH_ROUNDS == 8 -#define IV(i) ASCON_HASHA_IV##i +#define IV(i) U64TOWORD(ASCON_HASHA_IV##i) #elif ASCON_HASH_BYTES == 0 && ASCON_HASH_ROUNDS == 12 -#define IV(i) ASCON_XOF_IV##i +#define IV(i) U64TOWORD(ASCON_XOF_IV##i) #elif ASCON_HASH_BYTES == 0 && ASCON_HASH_ROUNDS == 8 -#define IV(i) ASCON_XOFA_IV##i +#define IV(i) U64TOWORD(ASCON_XOFA_IV##i) #endif forceinline void ascon_inithash(ascon_state_t* s) { diff --git a/src/opt8/aead.c b/src/opt8/aead.c index eb2cb1de2..f525cca44 100644 --- a/src/opt8/aead.c +++ b/src/opt8/aead.c @@ -25,8 +25,8 @@ forceinline void ascon_loadkey(ascon_key_t* key, const uint8_t* k) { forceinline void ascon_initaead(ascon_state_t* s, const ascon_key_t* key, const uint8_t* npub) { #if CRYPTO_KEYBYTES == 16 - if (ASCON_AEAD_RATE == 8) s->x[0] = ASCON_128_IV; - if (ASCON_AEAD_RATE == 16) s->x[0] = ASCON_128A_IV; + if (ASCON_AEAD_RATE == 8) s->x[0] = U64TOWORD(ASCON_128_IV); + if (ASCON_AEAD_RATE == 16) s->x[0] = U64TOWORD(ASCON_128A_IV); memcpy(s->b[1], key->b[0], 16); #else /* CRYPTO_KEYBYTES == 20 */ s->x[0] = key->x[0] | ASCON_80PQ_IV; diff --git a/src/opt8/hash.c b/src/opt8/hash.c index fd64b2f08..a9c410a6b 100644 --- a/src/opt8/hash.c +++ b/src/opt8/hash.c @@ -12,13 +12,13 @@ #ifdef ASCON_HASH_BYTES #if ASCON_HASH_BYTES == 32 && ASCON_HASH_ROUNDS == 12 -#define IV(i) ASCON_HASH_IV##i +#define IV(i) U64TOWORD(ASCON_HASH_IV##i) #elif ASCON_HASH_BYTES == 32 && ASCON_HASH_ROUNDS == 8 -#define IV(i) ASCON_HASHA_IV##i +#define IV(i) U64TOWORD(ASCON_HASHA_IV##i) #elif ASCON_HASH_BYTES == 0 && ASCON_HASH_ROUNDS == 12 -#define IV(i) ASCON_XOF_IV##i +#define IV(i) U64TOWORD(ASCON_XOF_IV##i) #elif ASCON_HASH_BYTES == 0 && ASCON_HASH_ROUNDS == 8 -#define IV(i) ASCON_XOFA_IV##i +#define IV(i) U64TOWORD(ASCON_XOFA_IV##i) #endif forceinline void ascon_inithash(ascon_state_t* s) { diff --git a/src/opt8_lowsize/aead.c b/src/opt8_lowsize/aead.c index e91033437..6b5279df5 100644 --- a/src/opt8_lowsize/aead.c +++ b/src/opt8_lowsize/aead.c @@ -25,8 +25,8 @@ forceinline void ascon_loadkey(ascon_key_t* key, const uint8_t* k) { forceinline void ascon_initaead(ascon_state_t* s, const ascon_key_t* key, const uint8_t* npub) { #if CRYPTO_KEYBYTES == 16 - if (ASCON_AEAD_RATE == 8) s->x[0] = ASCON_128_IV; - if (ASCON_AEAD_RATE == 16) s->x[0] = ASCON_128A_IV; + if (ASCON_AEAD_RATE == 8) s->x[0] = U64TOWORD(ASCON_128_IV); + if (ASCON_AEAD_RATE == 16) s->x[0] = U64TOWORD(ASCON_128A_IV); memcpy(s->b[1], key->b[0], 16); #else /* CRYPTO_KEYBYTES == 20 */ s->x[0] = key->x[0] | ASCON_80PQ_IV; diff --git a/src/opt8_lowsize/hash.c b/src/opt8_lowsize/hash.c index e933041b9..771572b38 100644 --- a/src/opt8_lowsize/hash.c +++ b/src/opt8_lowsize/hash.c @@ -5,13 +5,13 @@ #include "printstate.h" #if ASCON_HASH_BYTES == 32 && ASCON_HASH_ROUNDS == 12 -#define IV(i) ASCON_HASH_IV##i +#define IV(i) U64TOWORD(ASCON_HASH_IV##i) #elif ASCON_HASH_BYTES == 32 && ASCON_HASH_ROUNDS == 8 -#define IV(i) ASCON_HASHA_IV##i +#define IV(i) U64TOWORD(ASCON_HASHA_IV##i) #elif ASCON_HASH_BYTES == 0 && ASCON_HASH_ROUNDS == 12 -#define IV(i) ASCON_XOF_IV##i +#define IV(i) U64TOWORD(ASCON_XOF_IV##i) #elif ASCON_HASH_BYTES == 0 && ASCON_HASH_ROUNDS == 8 -#define IV(i) ASCON_XOFA_IV##i +#define IV(i) U64TOWORD(ASCON_XOFA_IV##i) #endif forceinline void ascon_inithash(ascon_state_t* s) {