Fix AlgorithmProvider for SIMON and SPECK on Solaris

pull/704/head
Jeffrey Walton 2018-08-17 07:49:35 -04:00
parent e2be0cdecc
commit b2c5616ede
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 28 additions and 20 deletions

View File

@ -243,7 +243,8 @@ extern size_t SIMON128_Dec_AdvancedProcessBlocks_POWER8(const word64* subKeys, s
std::string SIMON64::Base::AlgorithmProvider() const
{
#if defined(CRYPTOPP_SSE41_AVAILABLE)
#if (CRYPTOPP_SIMON64_ADVANCED_PROCESS_BLOCKS)
# if (CRYPTOPP_SSE41_AVAILABLE)
if (HasSSE41())
return "SSE4.1";
# endif
@ -254,6 +255,7 @@ std::string SIMON64::Base::AlgorithmProvider() const
# if (CRYPTOPP_POWER7_AVAILABLE)
if (HasPower7())
return "Power7";
# endif
#endif
return "C++";
}
@ -339,7 +341,8 @@ void SIMON64::Dec::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock,
std::string SIMON128::Base::AlgorithmProvider() const
{
#if defined(CRYPTOPP_SSSE3_AVAILABLE)
#if (CRYPTOPP_SIMON128_ADVANCED_PROCESS_BLOCKS)
# if (CRYPTOPP_SSSE3_AVAILABLE)
if (HasSSSE3())
return "SSSE3";
# endif
@ -350,6 +353,7 @@ std::string SIMON128::Base::AlgorithmProvider() const
# if (CRYPTOPP_POWER8_AVAILABLE)
if (HasPower8())
return "Power8";
# endif
#endif
return "C++";
}

View File

@ -218,7 +218,8 @@ extern size_t SPECK128_Dec_AdvancedProcessBlocks_POWER8(const word64* subKeys, s
std::string SPECK64::Base::AlgorithmProvider() const
{
#if defined(CRYPTOPP_SSE41_AVAILABLE)
#if (CRYPTOPP_SPECK64_ADVANCED_PROCESS_BLOCKS)
# if (CRYPTOPP_SSE41_AVAILABLE)
if (HasSSE41())
return "SSE4.1";
# endif
@ -229,6 +230,7 @@ std::string SPECK64::Base::AlgorithmProvider() const
# if (CRYPTOPP_POWER7_AVAILABLE)
if (HasPower7())
return "Power7";
# endif
#endif
return "C++";
}
@ -314,7 +316,8 @@ void SPECK64::Dec::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock,
std::string SPECK128::Base::AlgorithmProvider() const
{
#if defined(CRYPTOPP_SSSE3_AVAILABLE)
#if (CRYPTOPP_SPECK128_ADVANCED_PROCESS_BLOCKS)
# if (CRYPTOPP_SSSE3_AVAILABLE)
if (HasSSSE3())
return "SSSE3";
# endif
@ -325,6 +328,7 @@ std::string SPECK128::Base::AlgorithmProvider() const
# if (CRYPTOPP_POWER8_AVAILABLE)
if (HasPower8())
return "Power8";
# endif
#endif
return "C++";
}