diff options
| -rw-r--r-- | sosemanuk.cpp | 6 | ||||
| -rw-r--r-- | sosemanuk.h | 2 |
2 files changed, 4 insertions, 4 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
diff --git a/sosemanuk.h b/sosemanuk.h index a1f3f2f5..7a189be6 100644 --- a/sosemanuk.h +++ b/sosemanuk.h @@ -36,7 +36,7 @@ protected: void OperateKeystream(KeystreamOperation operation, byte *output, const byte *input, size_t iterationCount);
void CipherResynchronize(byte *keystreamBuffer, const byte *iv, size_t length);
bool CipherIsRandomAccess() const {return false;}
-#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 GetAlignment() const;
unsigned int GetOptimalBlockSize() const;
#endif
|