diff options
Diffstat (limited to 'src/block')
| -rw-r--r-- | src/block/threefish_avx2/threefish_avx2.cpp | 125 | ||||
| -rw-r--r-- | src/block/threefish_avx2/threefish_avx2.h | 1 |
2 files changed, 112 insertions, 14 deletions
diff --git a/src/block/threefish_avx2/threefish_avx2.cpp b/src/block/threefish_avx2/threefish_avx2.cpp index e1e000a5d..0a1a63bb0 100644 --- a/src/block/threefish_avx2/threefish_avx2.cpp +++ b/src/block/threefish_avx2/threefish_avx2.cpp @@ -33,6 +33,16 @@ inline void deinterleave_epi64(__m256i& X0, __m256i& X1) X1 = _mm256_unpackhi_epi64(T0, T1); } +// Threefish rotation constants +const __m256i ROTATE_1 = _mm256_set_epi64x(37,19,36,46); +const __m256i ROTATE_2 = _mm256_set_epi64x(42,14,27,33); +const __m256i ROTATE_3 = _mm256_set_epi64x(39,36,49,17); +const __m256i ROTATE_4 = _mm256_set_epi64x(56,54, 9,44); +const __m256i ROTATE_5 = _mm256_set_epi64x(24,34,30,39); +const __m256i ROTATE_6 = _mm256_set_epi64x(17,10,50,13); +const __m256i ROTATE_7 = _mm256_set_epi64x(43,39,29,25); +const __m256i ROTATE_8 = _mm256_set_epi64x(22,56,35, 8); + } void Threefish_512_AVX2::encrypt_n(const byte in[], byte out[], size_t blocks) const @@ -40,16 +50,6 @@ void Threefish_512_AVX2::encrypt_n(const byte in[], byte out[], size_t blocks) c const u64bit* K = &get_K()[0]; const u64bit* T_64 = &get_T()[0]; - const __m256i ROTATE_1 = _mm256_set_epi64x(37,19,36,46); - const __m256i ROTATE_2 = _mm256_set_epi64x(42,14,27,33); - const __m256i ROTATE_3 = _mm256_set_epi64x(39,36,49,17); - const __m256i ROTATE_4 = _mm256_set_epi64x(56,54, 9,44); - - const __m256i ROTATE_5 = _mm256_set_epi64x(24,34,30,39); - const __m256i ROTATE_6 = _mm256_set_epi64x(17,10,50,13); - const __m256i ROTATE_7 = _mm256_set_epi64x(43,39,29,25); - const __m256i ROTATE_8 = _mm256_set_epi64x(22,56,35, 8); - #define THREEFISH_ROUND(X0,X1,SHL) \ do { \ const __m256i SHR = _mm256_sub_epi64(_mm256_set1_epi64x(64), SHL); \ @@ -81,10 +81,10 @@ void Threefish_512_AVX2::encrypt_n(const byte in[], byte out[], size_t blocks) c \ THREEFISH_INJECT_KEY(R1, K1, K2, T0, T1); \ \ - THREEFISH_ROUND(X0,X1, ROTATE_5); \ - THREEFISH_ROUND(X0,X1, ROTATE_6); \ - THREEFISH_ROUND(X0,X1, ROTATE_7); \ - THREEFISH_ROUND(X0,X1, ROTATE_8); \ + THREEFISH_ROUND(X0, X1, ROTATE_5); \ + THREEFISH_ROUND(X0, X1, ROTATE_6); \ + THREEFISH_ROUND(X0, X1, ROTATE_7); \ + THREEFISH_ROUND(X0, X1, ROTATE_8); \ \ THREEFISH_INJECT_KEY(R2, K2, K3, T2, T0); \ } while(0) @@ -139,6 +139,103 @@ void Threefish_512_AVX2::encrypt_n(const byte in[], byte out[], size_t blocks) c _mm256_storeu_si256(out_mm++, X0); _mm256_storeu_si256(out_mm++, X1); } + +#undef THREEFISH_8_ROUNDS +#undef THREEFISH_ROUND +#undef THREEFISH_INJECT_KEY + } + +void Threefish_512_AVX2::decrypt_n(const byte in[], byte out[], size_t blocks) const + { + const u64bit* K = &get_K()[0]; + const u64bit* T_64 = &get_T()[0]; + +#define THREEFISH_ROUND(X0,X1,SHR) \ + do { \ + const __m256i SHL = _mm256_sub_epi64(_mm256_set1_epi64x(64), SHR); \ + X0 = _mm256_permute4x64_epi64(X0, _MM_SHUFFLE(2, 1, 0, 3)); \ + X1 = _mm256_permute4x64_epi64(X1, _MM_SHUFFLE(1, 2, 3, 0)); \ + X1 = _mm256_xor_si256(X1, X0); \ + X1 = _mm256_or_si256(_mm256_sllv_epi64(X1, SHL), _mm256_srlv_epi64(X1, SHR)); \ + X0 = _mm256_sub_epi64(X0, X1); \ + } while(0) + +#define THREEFISH_INJECT_KEY(r, K0, K1, T0I, T1I) \ + do { \ + const __m256i T0 = _mm256_permute4x64_epi64(T, _MM_SHUFFLE(T0I, 0, 0, 0)); \ + const __m256i T1 = _mm256_permute4x64_epi64(T, _MM_SHUFFLE(0, T1I, 0, 0)); \ + X0 = _mm256_sub_epi64(X0, K0); \ + X1 = _mm256_sub_epi64(X1, K1); \ + X1 = _mm256_sub_epi64(X1, R); \ + R = _mm256_sub_epi64(R, ONE); \ + X0 = _mm256_sub_epi64(X0, T0); \ + X1 = _mm256_sub_epi64(X1, T1); \ + } while(0) + +#define THREEFISH_8_ROUNDS(R1, R2, K1, K2, K3, T0, T1, T2) \ + do { \ + THREEFISH_INJECT_KEY(R2, K2, K3, T2, T0); \ + \ + THREEFISH_ROUND(X0, X1, ROTATE_8); \ + THREEFISH_ROUND(X0, X1, ROTATE_7); \ + THREEFISH_ROUND(X0, X1, ROTATE_6); \ + THREEFISH_ROUND(X0, X1, ROTATE_5); \ + \ + THREEFISH_INJECT_KEY(R1, K1, K2, T0, T1); \ + THREEFISH_ROUND(X0, X1, ROTATE_4); \ + THREEFISH_ROUND(X0, X1, ROTATE_3); \ + THREEFISH_ROUND(X0, X1, ROTATE_2); \ + THREEFISH_ROUND(X0, X1, ROTATE_1); \ + } while(0) + + /* + v1.0 key schedule: 9 ymm registers (only need 2 or 3) + (0,1,2,3),(4,5,6,7) [8] + then mutating with vpermq + */ + const __m256i K0 = _mm256_set_epi64x(K[6], K[4], K[2], K[0]); + const __m256i K1 = _mm256_set_epi64x(K[7], K[5], K[3], K[1]); + const __m256i K2 = _mm256_set_epi64x(K[8], K[6], K[4], K[2]); + const __m256i K3 = _mm256_set_epi64x(K[0], K[7], K[5], K[3]); + const __m256i K4 = _mm256_set_epi64x(K[1], K[8], K[6], K[4]); + const __m256i K5 = _mm256_set_epi64x(K[2], K[0], K[7], K[5]); + const __m256i K6 = _mm256_set_epi64x(K[3], K[1], K[8], K[6]); + const __m256i K7 = _mm256_set_epi64x(K[4], K[2], K[0], K[7]); + const __m256i K8 = _mm256_set_epi64x(K[5], K[3], K[1], K[8]); + + const __m256i ONE = _mm256_set_epi64x(1, 0, 0, 0); + + const __m256i* in_mm = reinterpret_cast<const __m256i*>(in); + __m256i* out_mm = reinterpret_cast<__m256i*>(out); + + for(size_t i = 0; i != blocks; ++i) + { + __m256i X0 = _mm256_loadu_si256(in_mm++); + __m256i X1 = _mm256_loadu_si256(in_mm++); + + const __m256i T = _mm256_set_epi64x(T_64[0], T_64[1], T_64[2], 0); + + __m256i R = _mm256_set_epi64x(18, 0, 0, 0); + + interleave_epi64(X0, X1); + + THREEFISH_8_ROUNDS(17, 18, K8,K0,K1, 3, 1, 2); + THREEFISH_8_ROUNDS(15, 16, K6,K7,K8, 2, 3, 1); + THREEFISH_8_ROUNDS(13, 14, K4,K5,K6, 1, 2, 3); + THREEFISH_8_ROUNDS(11, 12, K2,K3,K4, 3, 1, 2); + THREEFISH_8_ROUNDS( 9, 10, K0,K1,K2, 2, 3, 1); + THREEFISH_8_ROUNDS( 7, 8, K7,K8,K0, 1, 2, 3); + THREEFISH_8_ROUNDS( 5, 6, K5,K6,K7, 3, 1, 2); + THREEFISH_8_ROUNDS( 3, 4, K3,K4,K5, 2, 3, 1); + THREEFISH_8_ROUNDS( 1, 2, K1,K2,K3, 1, 2, 3); + + THREEFISH_INJECT_KEY(0, K0, K1, 2, 3); + + deinterleave_epi64(X0, X1); + + _mm256_storeu_si256(out_mm++, X0); + _mm256_storeu_si256(out_mm++, X1); + } } } diff --git a/src/block/threefish_avx2/threefish_avx2.h b/src/block/threefish_avx2/threefish_avx2.h index 71d2a0b20..ed0da00d6 100644 --- a/src/block/threefish_avx2/threefish_avx2.h +++ b/src/block/threefish_avx2/threefish_avx2.h @@ -19,6 +19,7 @@ class BOTAN_DLL Threefish_512_AVX2 : public Threefish_512 { private: void encrypt_n(const byte in[], byte out[], size_t blocks) const override; + void decrypt_n(const byte in[], byte out[], size_t blocks) const override; BlockCipher* clone() const override { return new Threefish_512_AVX2; } }; |