diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2017-11-29 08:00:21 -0500 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2017-11-29 08:00:21 -0500 |
| commit | bdb2db7ac282c085c73bcbf23ca7d334a2f0d13d (patch) | |
| tree | abea00dd7ce15ab7825a6d0f134f32db7c3dc3e0 /sosemanuk.cpp | |
| parent | c6c8dd3b323e9d0f5945fe4ad0255b90075e4fc5 (diff) | |
| download | cryptopp-git-bdb2db7ac282c085c73bcbf23ca7d334a2f0d13d.tar.gz | |
Uncouple GetAlignment from CRYPTOPP_DISABLE_SOSEMANUK_ASM
The class declaration needs to always include the functions for the platform. The implementation can simply return a different number, and that is hidden from the user
Diffstat (limited to 'sosemanuk.cpp')
| -rw-r--r-- | sosemanuk.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sosemanuk.cpp b/sosemanuk.cpp index cd8c0bb4..d303f878 100644 --- a/sosemanuk.cpp +++ b/sosemanuk.cpp @@ -288,10 +288,10 @@ word32 s_sosemanukMulTables[512] = { };
}
-#if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64) && !defined(CRYPTOPP_DISABLE_SOSEMANUK_ASM)
+#if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64)
unsigned int SosemanukPolicy::GetAlignment() const
{
-#if CRYPTOPP_SSE2_ASM_AVAILABLE && !defined(CRYPTOPP_DISABLE_SOSEMANUK_ASM)
+#if CRYPTOPP_SSE2_ASM_AVAILABLE
#ifdef __INTEL_COMPILER
if (HasSSE2() && !IsP4()) // Intel compiler produces faster code for this algorithm on the P4
#else
@@ -305,7 +305,7 @@ unsigned int SosemanukPolicy::GetAlignment() const unsigned int SosemanukPolicy::GetOptimalBlockSize() const
{
-#if CRYPTOPP_SSE2_ASM_AVAILABLE && !defined(CRYPTOPP_DISABLE_SOSEMANUK_ASM)
+#if CRYPTOPP_SSE2_ASM_AVAILABLE
#ifdef __INTEL_COMPILER
if (HasSSE2() && !IsP4()) // Intel compiler produces faster code for this algorithm on the P4
#else
|