From 3123bf4a55cc9f6a56de29af060f5f830bf4ab93 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Thu, 22 Apr 2021 13:27:06 -0400 Subject: Enable AVX2 for word_perm --- lsh256.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'lsh256.cpp') diff --git a/lsh256.cpp b/lsh256.cpp index 0d296c1a..ef2090c2 100644 --- a/lsh256.cpp +++ b/lsh256.cpp @@ -206,31 +206,25 @@ lsh_u32 ROTL(lsh_u32 x, lsh_u32 r) { * LSH: iv * -------------------------------------------------------- */ -#if (CRYPTOPP_CXX11_CONSTEXPR) -# define MAYBE_CONSTEXPR constexpr -#else -# define MAYBE_CONSTEXPR const -#endif - CRYPTOPP_ALIGN_DATA(32) -MAYBE_CONSTEXPR lsh_u32 g_IV224[CV_WORD_LEN] = { +const lsh_u32 g_IV224[CV_WORD_LEN] = { 0x068608D3, 0x62D8F7A7, 0xD76652AB, 0x4C600A43, 0xBDC40AA8, 0x1ECA0B68, 0xDA1A89BE, 0x3147D354, 0x707EB4F9, 0xF65B3862, 0x6B0B2ABE, 0x56B8EC0A, 0xCF237286, 0xEE0D1727, 0x33636595, 0x8BB8D05F, }; CRYPTOPP_ALIGN_DATA(32) -MAYBE_CONSTEXPR lsh_u32 g_IV256[CV_WORD_LEN] = { +const lsh_u32 g_IV256[CV_WORD_LEN] = { 0x46a10f1f, 0xfddce486, 0xb41443a8, 0x198e6b9d, 0x3304388d, 0xb0f5a3c7, 0xb36061c4, 0x7adbd553, 0x105d5378, 0x2f74de54, 0x5c2f2d95, 0xf2553fbe, 0x8051357a, 0x138668c8, 0x47aa4484, 0xe01afb41 }; -MAYBE_CONSTEXPR lsh_uint g_gamma256[8] = { 0, 8, 16, 24, 24, 16, 8, 0 }; +const lsh_uint g_gamma256[8] = { 0, 8, 16, 24, 24, 16, 8, 0 }; /* -------------------------------------------------------- * * LSH: step constants * -------------------------------------------------------- */ -MAYBE_CONSTEXPR lsh_u32 g_StepConstants[CONST_WORD_LEN * NUM_STEPS] = { +const lsh_u32 g_StepConstants[CONST_WORD_LEN * NUM_STEPS] = { 0x917caf90, 0x6c1b10a2, 0x6f352943, 0xcf778243, 0x2ceb7472, 0x29e96ff2, 0x8a9ba428, 0x2eeb2642, 0x0e2c4021, 0x872bb30e, 0xa45e6cb2, 0x46f9c612, 0x185fe69e, 0x1359621b, 0x263fccb2, 0x1a116870, 0x3a6c612f, 0xb2dec195, 0x02cb1f56, 0x40bfd858, 0x784684b6, 0x6cbb7d2e, 0x660c7ed8, 0x2b79d88a, -- cgit v1.2.1