From 1c7bd8499b4eb0f5d0362661c86d9412f7c1bafc Mon Sep 17 00:00:00 2001 From: weidai Date: Fri, 13 Mar 2009 11:15:21 +0000 Subject: fix compile on OpenSolaris 8.11 git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@450 57ff6487-cd31-0410-9ec3-f628ee90f5f0 --- sosemanuk.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'sosemanuk.cpp') diff --git a/sosemanuk.cpp b/sosemanuk.cpp index e0e411f..0863675 100755 --- a/sosemanuk.cpp +++ b/sosemanuk.cpp @@ -12,10 +12,6 @@ #include "serpentp.h" -#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE -#include -#endif - NAMESPACE_BEGIN(CryptoPP) void SosemanukPolicy::CipherSetKey(const NameValuePairs ¶ms, const byte *userKey, size_t keylen) @@ -353,7 +349,7 @@ void SosemanukPolicy::OperateKeystream(KeystreamOperation operation, byte *outpu { #ifdef __GNUC__ #if CRYPTOPP_BOOL_X64 - __m128i workspace[(80*4*2+12*4+8*WORD_SZ)/16]; + FixedSizeAlignedSecBlock workspace; #endif __asm__ __volatile__ ( @@ -601,8 +597,8 @@ void SosemanukPolicy::OperateKeystream(KeystreamOperation operation, byte *outpu : : "a" (m_state.m_ptr), "c" (iterationCount), "S" (s_sosemanukMulTables), "D" (output), "d" (input) #if CRYPTOPP_BOOL_X64 - , "r" (workspace) - : "memory", "cc", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7" + , "r" (workspace.m_ptr) + : "memory", "cc", "%r9", "%r10", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7" #else : "memory", "cc" #endif -- cgit v1.2.1