diff options
| author | Jack Lloyd <[email protected]> | 2018-01-04 10:36:53 -0500 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2018-01-04 10:36:53 -0500 |
| commit | 20485157e131ca5cc8536bf0b88bdf3da806c473 (patch) | |
| tree | 49a9418f85b093e91455b99635e110dc09b561c2 | |
| parent | 01bd45ad63bc4080fe2d81d3850f7f07d80e9c5d (diff) | |
Add missing ISA annotations
Lack of these broke single file amalgamation (GH #1386)
| -rw-r--r-- | src/lib/block/shacal2/shacal2_x86/shacal2_x86.cpp | 1 | ||||
| -rw-r--r-- | src/lib/hash/sha1/sha1_x86/sha1_x86.cpp | 2 | ||||
| -rw-r--r-- | src/lib/hash/sha2_32/sha2_32_x86/info.txt | 2 | ||||
| -rw-r--r-- | src/lib/hash/sha2_32/sha2_32_x86/sha2_32_x86.cpp | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/block/shacal2/shacal2_x86/shacal2_x86.cpp b/src/lib/block/shacal2/shacal2_x86/shacal2_x86.cpp index 6cb03adef..1611d6c9b 100644 --- a/src/lib/block/shacal2/shacal2_x86/shacal2_x86.cpp +++ b/src/lib/block/shacal2/shacal2_x86/shacal2_x86.cpp @@ -15,6 +15,7 @@ Only encryption is supported since the inverse round function would require a different instruction */ +BOTAN_FUNC_ISA("sha,ssse3") void SHACAL2::x86_encrypt_blocks(const uint8_t in[], uint8_t out[], size_t blocks) const { const __m128i MASK1 = _mm_set_epi8(8,9,10,11,12,13,14,15,0,1,2,3,4,5,6,7); diff --git a/src/lib/hash/sha1/sha1_x86/sha1_x86.cpp b/src/lib/hash/sha1/sha1_x86/sha1_x86.cpp index 1da3eda63..76feebcea 100644 --- a/src/lib/hash/sha1/sha1_x86/sha1_x86.cpp +++ b/src/lib/hash/sha1/sha1_x86/sha1_x86.cpp @@ -18,7 +18,7 @@ namespace Botan { #if defined(BOTAN_HAS_SHA1_X86_SHA_NI) -BOTAN_FUNC_ISA("sha") +BOTAN_FUNC_ISA("sha,ssse3,sse4.1") void SHA_160::sha1_compress_x86(secure_vector<uint32_t>& digest, const uint8_t input[], size_t blocks) diff --git a/src/lib/hash/sha2_32/sha2_32_x86/info.txt b/src/lib/hash/sha2_32/sha2_32_x86/info.txt index 838d2a4a8..4a0b25910 100644 --- a/src/lib/hash/sha2_32/sha2_32_x86/info.txt +++ b/src/lib/hash/sha2_32/sha2_32_x86/info.txt @@ -2,7 +2,7 @@ SHA2_32_X86 -> 20170518 </defines> -need_isa sha,sse41 +need_isa sha,ssse3,sse41 <cc> gcc:5.0 diff --git a/src/lib/hash/sha2_32/sha2_32_x86/sha2_32_x86.cpp b/src/lib/hash/sha2_32/sha2_32_x86/sha2_32_x86.cpp index ee8af1e22..a4bd9b72d 100644 --- a/src/lib/hash/sha2_32/sha2_32_x86/sha2_32_x86.cpp +++ b/src/lib/hash/sha2_32/sha2_32_x86/sha2_32_x86.cpp @@ -13,6 +13,7 @@ namespace Botan { // called from sha2_32.cpp #if defined(BOTAN_HAS_SHA2_32_X86) +BOTAN_FUNC_ISA("sha,sse4.1,ssse3") void SHA_256::compress_digest_x86(secure_vector<uint32_t>& digest, const uint8_t input[], size_t blocks) { __m128i STATE0, STATE1; |