arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix Salsa validation failure when compiling with GCC 4.6 (https://sourceforge.net/apps/trac/cryptopp/ticket/12)

pull/2/head
weidai 2011-06-05 21:07:11 +00:00
parent fecbd5b18b
commit f5912cc4e6
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
salsa.cpp
View File

@ -122,17 +122,17 @@ void Salsa20_Policy::OperateKeystream(KeystreamOperation operation, byte *output
if (HasSSE2()) if (HasSSE2())
{ {
#if CRYPTOPP_BOOL_X64 #if CRYPTOPP_BOOL_X64
#define REG_output %4 #define REG_output %1
#define REG_input %1 #define REG_input %0
#define REG_iterationCount %2 #define REG_iterationCount %2
#define REG_state %3 #define REG_state %4 /* constant */
#define REG_rounds %0 #define REG_rounds %3 /* constant */
#define REG_roundsLeft eax #define REG_roundsLeft eax
#define REG_temp32 edx #define REG_temp32 edx
#define REG_temp rdx #define REG_temp rdx
#define SSE2_WORKSPACE %5 #define SSE2_WORKSPACE %5 /* constant */
FixedSizeAlignedSecBlock<byte, 32*16> workspace; CRYPTOPP_ALIGN_DATA(16) byte workspace[16*32];
#else #else
#define REG_output edi #define REG_output edi
#define REG_input eax #define REG_input eax
@ -457,12 +457,13 @@ void Salsa20_Policy::OperateKeystream(KeystreamOperation operation, byte *output
#ifdef __GNUC__ #ifdef __GNUC__
AS_POP_IF86( bx) AS_POP_IF86( bx)
".att_syntax prefix;" ".att_syntax prefix;"
:
#if CRYPTOPP_BOOL_X64 #if CRYPTOPP_BOOL_X64
: "r" (m_rounds), "r" (input), "r" (iterationCount), "r" (m_state.data()), "r" (output), "r" (workspace.m_ptr) : "+r" (input), "+r" (output), "+r" (iterationCount)
: "%eax", "%edx", "memory", "cc", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7", "%xmm8", "%xmm9", "%xmm10", "%xmm11", "%xmm12", "%xmm13", "%xmm14", "%xmm15" : "r" (m_rounds), "r" (m_state.m_ptr), "r" (workspace)
: "%eax", "%rdx", "memory", "cc", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7", "%xmm8", "%xmm9", "%xmm10", "%xmm11", "%xmm12", "%xmm13", "%xmm14", "%xmm15"
#else #else
: "d" (m_rounds), "a" (input), "c" (iterationCount), "S" (m_state.data()), "D" (output) : "+a" (input), "+D" (output), "+c" (iterationCount)
: "d" (m_rounds), "S" (m_state.m_ptr)
: "memory", "cc" : "memory", "cc"
#endif #endif
); );