diff options
| author | weidai <weidai11@users.noreply.github.com> | 2009-03-13 11:15:21 +0000 |
|---|---|---|
| committer | weidai <weidai11@users.noreply.github.com> | 2009-03-13 11:15:21 +0000 |
| commit | 3202bf2809a8fd86e753d94554673da72cf269ad (patch) | |
| tree | b4cbd949b59bbf44f8e627d3b91c3556754b9d06 /sha.cpp | |
| parent | 393a5eac05d04715e10134ae8d01fffca5e30fdc (diff) | |
| download | cryptopp-git-3202bf2809a8fd86e753d94554673da72cf269ad.tar.gz | |
fix compile on OpenSolaris 8.11
Diffstat (limited to 'sha.cpp')
| -rw-r--r-- | sha.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
@@ -14,10 +14,6 @@ #include "misc.h" #include "cpu.h" -#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE -#include <emmintrin.h> -#endif - NAMESPACE_BEGIN(CryptoPP) // start of Steve Reid's code @@ -230,12 +226,12 @@ static void CRYPTOPP_FASTCALL X86_SHA256_HashBlocks(word32 *state, const word32 #if defined(__GNUC__) #if CRYPTOPP_BOOL_X64 - __m128i workspace[(LOCALS_SIZE+15)/16]; + FixedSizeAlignedSecBlock<byte, LOCALS_SIZE> workspace; #endif __asm__ __volatile__ ( #if CRYPTOPP_BOOL_X64 - "movq %4, %%r8;" + "lea %4, %%r8;" #endif ".intel_syntax noprefix;" #elif defined(CRYPTOPP_GENERATE_X64_MASM) @@ -420,7 +416,7 @@ static void CRYPTOPP_FASTCALL X86_SHA256_HashBlocks(word32 *state, const word32 : : "c" (state), "d" (data), "S" (SHA256_K+48), "D" (len) #if CRYPTOPP_BOOL_X64 - , "r" (workspace) + , "m" (workspace[0]) #endif : "memory", "cc", "%eax" #if CRYPTOPP_BOOL_X64 |