diff options
| author | Jack Lloyd <[email protected]> | 2018-11-05 18:13:15 -0500 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2018-11-05 18:13:15 -0500 |
| commit | b7fad32c861607a05575e16a7300233bd2eecacc (patch) | |
| tree | 7188f2f43bf444d0d9714695feff938063f6b484 /src/lib/block/shacal2 | |
| parent | f4756ed6e393e91e0991e35bc862f258513889cb (diff) | |
Remove SIMD_32 typedef
It is confusing since its not clear from the name how many
elements it has, and this gives consistency with SIMD_8x32 type.
Diffstat (limited to 'src/lib/block/shacal2')
| -rw-r--r-- | src/lib/block/shacal2/shacal2_simd/shacal2_simd.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/block/shacal2/shacal2_simd/shacal2_simd.cpp b/src/lib/block/shacal2/shacal2_simd/shacal2_simd.cpp index bdcac1482..6d15faf1a 100644 --- a/src/lib/block/shacal2/shacal2_simd/shacal2_simd.cpp +++ b/src/lib/block/shacal2/shacal2_simd/shacal2_simd.cpp @@ -13,23 +13,23 @@ namespace Botan { namespace { inline -void SHACAL2_Fwd(const SIMD_32& A, const SIMD_32& B, const SIMD_32& C, SIMD_32& D, - const SIMD_32& E, const SIMD_32& F, const SIMD_32& G, SIMD_32& H, +void SHACAL2_Fwd(const SIMD_4x32& A, const SIMD_4x32& B, const SIMD_4x32& C, SIMD_4x32& D, + const SIMD_4x32& E, const SIMD_4x32& F, const SIMD_4x32& G, SIMD_4x32& H, uint32_t RK) { - H += E.rho<6,11,25>() + ((E & F) ^ (~E & G)) + SIMD_32::splat(RK); + H += E.rho<6,11,25>() + ((E & F) ^ (~E & G)) + SIMD_4x32::splat(RK); D += H; H += A.rho<2,13,22>() + ((A & B) | ((A | B) & C)); } inline -void SHACAL2_Rev(const SIMD_32& A, const SIMD_32& B, const SIMD_32& C, SIMD_32& D, - const SIMD_32& E, const SIMD_32& F, const SIMD_32& G, SIMD_32& H, +void SHACAL2_Rev(const SIMD_4x32& A, const SIMD_4x32& B, const SIMD_4x32& C, SIMD_4x32& D, + const SIMD_4x32& E, const SIMD_4x32& F, const SIMD_4x32& G, SIMD_4x32& H, uint32_t RK) { H -= A.rho<2,13,22>() + ((A & B) | ((A | B) & C)); D -= H; - H -= E.rho<6,11,25>() + ((E & F) ^ (~E & G)) + SIMD_32::splat(RK); + H -= E.rho<6,11,25>() + ((E & F) ^ (~E & G)) + SIMD_4x32::splat(RK); } } |