QPQ-AG/libsodium
12
0
Fork 0
mirror of https://github.com/jedisct1/libsodium.git synced 2026-08-25 08:37:13 +09:00
Code Issues Packages Projects Releases Wiki Activity

Avoid C99isms

Browse Source
This commit is contained in:
Frank Denis
2022-11-13 21:23:19 +01:00
parent ae8f462ad3
commit 379cd8303b
2 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsodium/crypto_aead/aes256gcm/aesni/aead_aes256gcm_aesni.c
+12 -12
View File
@@ -74,9 +74,9 @@ static inline I256
XOR256(const I256 a, const I256 b)
{
return (I256) {
.hi = XOR128(a.hi, b.hi),
.lo = XOR128(a.lo, b.lo),
.mid = XOR128(a.mid, b.mid),
SODIUM_C99(.hi =) XOR128(a.hi, b.hi),
SODIUM_C99(.lo =) XOR128(a.lo, b.lo),
SODIUM_C99(.mid =) XOR128(a.mid, b.mid),
};
}
@@ -205,9 +205,9 @@ clsq128(const BlockVec x)
const BlockVec r_mid = XOR128(CLMULLO128(mid, mid), XOR128(r_lo, r_hi));
return (I256) {
.hi = r_hi,
.lo = r_lo,
.mid = r_mid,
SODIUM_C99(.hi =) r_hi,
SODIUM_C99(.lo =) r_lo,
SODIUM_C99(.mid =) r_mid,
};
}
@@ -225,9 +225,9 @@ clmul128(const BlockVec x, const BlockVec y)
const BlockVec r_mid = XOR128(CLMULLO128(XOR128(x, x_hi), XOR128(y, y_hi)), XOR128(r_lo, r_hi));
return (I256) {
.hi = r_hi,
.lo = r_lo,
.mid = r_mid,
SODIUM_C99(.hi =) r_hi,
SODIUM_C99(.lo =) r_lo,
SODIUM_C99(.mid =) r_mid,
};
#else
const BlockVec r_hi = CLMULHI128(x, y);
@@ -235,9 +235,9 @@ clmul128(const BlockVec x, const BlockVec y)
const BlockVec r_mid = XOR128(CLMULHILO128(x, y), CLMULLOHI128(x, y));
return (I256) {
.hi = r_hi,
.lo = r_lo,
.mid = r_mid,
SODIUM_C99(.hi =) r_hi,
SODIUM_C99(.lo =) r_lo,
SODIUM_C99(.mid =) r_mid,
};
#endif
}
src/libsodium/crypto_aead/aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c
+12 -12
View File
@@ -89,9 +89,9 @@ static inline I256
XOR256(const I256 a, const I256 b)
{
return (I256) {
.hi = XOR128(a.hi, b.hi),
.lo = XOR128(a.lo, b.lo),
.mid = XOR128(a.mid, b.mid),
SODIUM_C99(.hi =) XOR128(a.hi, b.hi),
SODIUM_C99(.lo =) XOR128(a.lo, b.lo),
SODIUM_C99(.mid =) XOR128(a.mid, b.mid),
};
}
@@ -220,9 +220,9 @@ clsq128(const BlockVec x)
const BlockVec r_mid = XOR128(CLMULLO128(mid, mid), XOR128(r_lo, r_hi));
return (I256) {
.hi = r_hi,
.lo = r_lo,
.mid = r_mid,
SODIUM_C99(.hi =) r_hi,
SODIUM_C99(.lo =) r_lo,
SODIUM_C99(.mid =) r_mid,
};
}
@@ -240,9 +240,9 @@ clmul128(const BlockVec x, const BlockVec y)
const BlockVec r_mid = XOR128(CLMULLO128(XOR128(x, x_hi), XOR128(y, y_hi)), XOR128(r_lo, r_hi));
return (I256) {
.hi = r_hi,
.lo = r_lo,
.mid = r_mid,
SODIUM_C99(.hi =) r_hi,
SODIUM_C99(.lo =) r_lo,
SODIUM_C99(.mid =) r_mid,
};
#else
const BlockVec r_hi = CLMULHI128(x, y);
@@ -250,9 +250,9 @@ clmul128(const BlockVec x, const BlockVec y)
const BlockVec r_mid = XOR128(CLMULHILO128(x, y), CLMULLOHI128(x, y));
return (I256) {
.hi = r_hi,
.lo = r_lo,
.mid = r_mid,
SODIUM_C99(.hi =) r_hi,
SODIUM_C99(.lo =) r_lo,
SODIUM_C99(.mid =) r_mid,
};
#endif
}