diff options
| author | Jack Lloyd <[email protected]> | 2016-12-11 15:28:38 -0500 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2016-12-18 16:48:24 -0500 |
| commit | f3cb3edb512bdcab498d825886c3366c341b3f78 (patch) | |
| tree | 645c73ec295a5a34f25d99903b6d9fa9751e86d3 /src/lib/block/threefish/threefish_avx2 | |
| parent | c1dd21253c1f3188ff45d3ad47698efd08235ae8 (diff) | |
Convert to using standard uintN_t integer types
Renames a couple of functions for somewhat better name consistency,
eg make_u32bit becomes make_uint32. The old typedefs remain for now
since probably lots of application code uses them.
Diffstat (limited to 'src/lib/block/threefish/threefish_avx2')
| -rw-r--r-- | src/lib/block/threefish/threefish_avx2/threefish_avx2.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/block/threefish/threefish_avx2/threefish_avx2.cpp b/src/lib/block/threefish/threefish_avx2/threefish_avx2.cpp index e4a46e3de..b8e2320ae 100644 --- a/src/lib/block/threefish/threefish_avx2/threefish_avx2.cpp +++ b/src/lib/block/threefish/threefish_avx2/threefish_avx2.cpp @@ -75,10 +75,10 @@ inline void rotate_keys(__m256i& R0, __m256i& R1, __m256i R2) } BOTAN_FUNC_ISA("avx2") -void Threefish_512::avx2_encrypt_n(const byte in[], byte out[], size_t blocks) const +void Threefish_512::avx2_encrypt_n(const uint8_t in[], uint8_t out[], size_t blocks) const { - const u64bit* K = &get_K()[0]; - const u64bit* T_64 = &get_T()[0]; + const uint64_t* K = &get_K()[0]; + const uint64_t* 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); @@ -250,10 +250,10 @@ void Threefish_512::avx2_encrypt_n(const byte in[], byte out[], size_t blocks) c } BOTAN_FUNC_ISA("avx2") -void Threefish_512::avx2_decrypt_n(const byte in[], byte out[], size_t blocks) const +void Threefish_512::avx2_decrypt_n(const uint8_t in[], uint8_t out[], size_t blocks) const { - const u64bit* K = &get_K()[0]; - const u64bit* T_64 = &get_T()[0]; + const uint64_t* K = &get_K()[0]; + const uint64_t* 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); |