feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #5195 from LinuxJedi/ULL-fix

Browse Source 
Fix 64bit postfix for constants
This commit is contained in:
David Garske
2022-06-01 09:40:26 -07:00
committed by GitHub
parent 494a9fe41a 11a7756527
commit cced5bd700
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wolfcrypt/src/aes.c
View File

@ -6671,9 +6671,9 @@ void GHASH(Aes* aes, const byte* a, word32 aSz, const byte* c,
}
#ifdef OPENSSL_EXTRA
/* store AAD partial tag for next call */
aes->aadH[0] = (word32)((x[0] & 0xFFFFFFFF00000000) >> 32);
aes->aadH[0] = (word32)((x[0] & 0xFFFFFFFF00000000ULL) >> 32);
aes->aadH[1] = (word32)(x[0] & 0xFFFFFFFF);
aes->aadH[2] = (word32)((x[1] & 0xFFFFFFFF00000000) >> 32);
aes->aadH[2] = (word32)((x[1] & 0xFFFFFFFF00000000ULL) >> 32);
aes->aadH[3] = (word32)(x[1] & 0xFFFFFFFF);
#endif
}

18
wolfcrypt/src/siphash.c
View File

@ -165,15 +165,15 @@ int wc_InitSipHash(SipHash* sipHash, const unsigned char* key,
word64 k1 = GET_U64(key + 8);
/* Initialize state with key. */
sipHash->v[0] = 0x736f6d6570736575UL;
sipHash->v[0] = 0x736f6d6570736575ULL;
if (outSz == SIPHASH_MAC_SIZE_8) {
sipHash->v[1] = 0x646f72616e646f6dUL;
sipHash->v[1] = 0x646f72616e646f6dULL;
}
else {
sipHash->v[1] = 0x646f72616e646f83UL;
sipHash->v[1] = 0x646f72616e646f83ULL;
}
sipHash->v[2] = 0x6c7967656e657261UL;
sipHash->v[3] = 0x7465646279746573UL;
sipHash->v[2] = 0x6c7967656e657261ULL;
sipHash->v[3] = 0x7465646279746573ULL;
sipHash->v[0] ^= k0;
sipHash->v[1] ^= k1;
@ -860,10 +860,10 @@ int wc_SipHash(const unsigned char* key, const unsigned char* in, word32 inSz,
word64 b = (word64)((word64)inSz << 56);
/* Initialize state with key. */
v0 = 0x736f6d6570736575UL;
v1 = 0x646f72616e646f6dUL;
v2 = 0x6c7967656e657261UL;
v3 = 0x7465646279746573UL;
v0 = 0x736f6d6570736575ULL;
v1 = 0x646f72616e646f6dULL;
v2 = 0x6c7967656e657261ULL;
v3 = 0x7465646279746573ULL;
if (outSz == SIPHASH_MAC_SIZE_16) {
v1 ^= 0xee;