diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/utils/cpuid/cpuid.cpp | 2 | ||||
| -rw-r--r-- | src/tests/data/block/shacal2.vec | 2 | ||||
| -rw-r--r-- | src/tests/data/hash/sha1.vec | 2 | ||||
| -rw-r--r-- | src/tests/data/hash/sha2_32.vec | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/utils/cpuid/cpuid.cpp b/src/lib/utils/cpuid/cpuid.cpp index d0489cb67..3938c7242 100644 --- a/src/lib/utils/cpuid/cpuid.cpp +++ b/src/lib/utils/cpuid/cpuid.cpp @@ -150,6 +150,8 @@ CPUID::bit_from_string(const std::string& tok) return {Botan::CPUID::CPUID_BMI2_BIT}; if(tok == "adx") return {Botan::CPUID::CPUID_ADX_BIT}; + if(tok == "intel_sha") + return {Botan::CPUID::CPUID_SHA_BIT}; #elif defined(BOTAN_TARGET_CPU_IS_PPC_FAMILY) if(tok == "altivec" || tok == "simd") diff --git a/src/tests/data/block/shacal2.vec b/src/tests/data/block/shacal2.vec index 5eaf70a29..ed3fdde11 100644 --- a/src/tests/data/block/shacal2.vec +++ b/src/tests/data/block/shacal2.vec @@ -1,3 +1,5 @@ +#test cpuid sse2 intel_sha + [SHACAL2] # From Bouncy Castle diff --git a/src/tests/data/hash/sha1.vec b/src/tests/data/hash/sha1.vec index c1435958b..ebaec1613 100644 --- a/src/tests/data/hash/sha1.vec +++ b/src/tests/data/hash/sha1.vec @@ -1,4 +1,4 @@ -#test cpuid sse2 sha armv8sha1 +#test cpuid sse2 intel_sha armv8sha1 [SHA-160] In = diff --git a/src/tests/data/hash/sha2_32.vec b/src/tests/data/hash/sha2_32.vec index af2491fd6..76baa8a5c 100644 --- a/src/tests/data/hash/sha2_32.vec +++ b/src/tests/data/hash/sha2_32.vec @@ -1,4 +1,4 @@ -#test cpuid sha armv8sha2 bmi2 +#test cpuid intel_sha armv8sha2 bmi2 [SHA-224] In = |