diff options
| author | Jack Lloyd <[email protected]> | 2017-05-19 12:30:20 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2017-05-19 12:30:20 -0400 |
| commit | 7d1bef2a8fa081f9896eebbba6ae37e273c91099 (patch) | |
| tree | 2a1bfad548b91757d7373a83cff67ae7c94810a9 /src/tests | |
| parent | b0fbcf8d24fb1c677aad3d2cfdd0c18274493f07 (diff) | |
| parent | 7f019174bfcf3c2b31bda74fe40ce35727db1cef (diff) | |
Merge GH #826 Add support for Intel SHA instructions
Diffstat (limited to 'src/tests')
| -rw-r--r-- | src/tests/data/hash/sha1.vec | 2 | ||||
| -rw-r--r-- | src/tests/data/hash/sha2_32.vec | 2 | ||||
| -rw-r--r-- | src/tests/tests.cpp | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/tests/data/hash/sha1.vec b/src/tests/data/hash/sha1.vec index e86650f30..395de6efc 100644 --- a/src/tests/data/hash/sha1.vec +++ b/src/tests/data/hash/sha1.vec @@ -1,4 +1,4 @@ -#test cpuid sse2 +#test cpuid sse2 sha [SHA-160] In = diff --git a/src/tests/data/hash/sha2_32.vec b/src/tests/data/hash/sha2_32.vec index e1f32bfb2..d71f49f20 100644 --- a/src/tests/data/hash/sha2_32.vec +++ b/src/tests/data/hash/sha2_32.vec @@ -1,3 +1,5 @@ +#test cpuid sha + [SHA-224] In = Out = D14A028C2A3A2BC9476102BB288234C415A2B01F828EA62AC5B3E42F diff --git a/src/tests/tests.cpp b/src/tests/tests.cpp index 2252cb221..1886aa122 100644 --- a/src/tests/tests.cpp +++ b/src/tests/tests.cpp @@ -885,6 +885,8 @@ std::vector<Botan::CPUID::CPUID_bits> map_cpuid_string(const std::string& tok) return {Botan::CPUID::CPUID_CLMUL_BIT}; if(tok == "avx2") return {Botan::CPUID::CPUID_AVX2_BIT}; + if(tok == "sha") + return {Botan::CPUID::CPUID_SHA_BIT}; #endif #if defined(BOTAN_TARGET_CPU_IS_PPC_FAMILY) |