diff options
author | Jack Lloyd <[email protected]> | 2019-06-19 18:14:09 -0400 |
---|---|---|
committer | Jack Lloyd <[email protected]> | 2019-06-19 18:14:09 -0400 |
commit | 8ba915974d99ce4be89ad487eb6b5ec565591dd6 (patch) | |
tree | 4b9fef1801acfebc4d88d5693ddd4f87201b91f8 | |
parent | 938563c0d287ee1234e1728c44e81be287bed4d1 (diff) |
Fix conflict when BMI2 is enabled and --single-amalgamation-file
Not sure why this wasn't causing an error in the MSVC CI builds.
-rw-r--r-- | src/lib/hash/sha3/sha3_bmi2/sha3_bmi2.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/hash/sha3/sha3_bmi2/sha3_bmi2.cpp b/src/lib/hash/sha3/sha3_bmi2/sha3_bmi2.cpp index 420a90f9f..a9650ad9d 100644 --- a/src/lib/hash/sha3/sha3_bmi2/sha3_bmi2.cpp +++ b/src/lib/hash/sha3/sha3_bmi2/sha3_bmi2.cpp @@ -12,7 +12,7 @@ namespace Botan { namespace { -inline void SHA3_round(uint64_t T[25], const uint64_t A[25], uint64_t RC) +inline void SHA3_BMI2_round(uint64_t T[25], const uint64_t A[25], uint64_t RC) { const uint64_t C0 = A[0] ^ A[5] ^ A[10] ^ A[15] ^ A[20]; const uint64_t C1 = A[1] ^ A[6] ^ A[11] ^ A[16] ^ A[21]; @@ -101,8 +101,8 @@ void SHA_3::permute_bmi2(uint64_t A[25]) for(size_t i = 0; i != 24; i += 2) { - SHA3_round(T, A, RC[i+0]); - SHA3_round(A, T, RC[i+1]); + SHA3_BMI2_round(T, A, RC[i+0]); + SHA3_BMI2_round(A, T, RC[i+1]); } } |