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

fix bugs in AES assembly (from trantrungan and Andrew Bromba)

pull/2/head
weidai 2009-07-05 22:30:24 +00:00
parent 5221b19822
commit 1f00d79595
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rijndael.cpp
View File

@ -90,7 +90,7 @@ static word64 Td[256];
#else #else
static word32 Te[256*4], Td[256*4]; static word32 Te[256*4], Td[256*4];
#endif #endif
static bool s_TeFilled = false, s_TdFilled = false; static volatile bool s_TeFilled = false, s_TdFilled = false;
// ************************* Portable Code ************************************ // ************************* Portable Code ************************************
@ -529,7 +529,7 @@ CRYPTOPP_NAKED void CRYPTOPP_FASTCALL Rijndael_Enc_AdvancedProcessBlocks(void *l
.endprolog .endprolog
mov L_REG, rcx mov L_REG, rcx
mov AS_REG_7, ?Te@rdtable@CryptoPP@@3PA_KA mov AS_REG_7, ?Te@rdtable@CryptoPP@@3PA_KA
mov rdi, QWORD PTR [?g_cacheLineSize@CryptoPP@@3IA] mov edi, DWORD PTR [?g_cacheLineSize@CryptoPP@@3IA]
#elif defined(__GNUC__) #elif defined(__GNUC__)
__asm__ __volatile__ __asm__ __volatile__
( (
@ -543,9 +543,7 @@ CRYPTOPP_NAKED void CRYPTOPP_FASTCALL Rijndael_Enc_AdvancedProcessBlocks(void *l
#else #else
AS_PUSH_IF86(si) AS_PUSH_IF86(si)
AS_PUSH_IF86(di) AS_PUSH_IF86(di)
#if !defined(_MSC_VER) || (_MSC_VER < 1400)
AS_PUSH_IF86(bx) AS_PUSH_IF86(bx)
#endif
AS_PUSH_IF86(bp) AS_PUSH_IF86(bp)
AS2( lea AS_REG_7, [Te]) AS2( lea AS_REG_7, [Te])
AS2( mov edi, [g_cacheLineSize]) AS2( mov edi, [g_cacheLineSize])
@ -875,9 +873,7 @@ CRYPTOPP_NAKED void CRYPTOPP_FASTCALL Rijndael_Enc_AdvancedProcessBlocks(void *l
AS1( emms) AS1( emms)
#endif #endif
AS_POP_IF86(bp) AS_POP_IF86(bp)
#if !defined(_MSC_VER) || (_MSC_VER < 1400)
AS_POP_IF86(bx) AS_POP_IF86(bx)
#endif
#if defined(_MSC_VER) && CRYPTOPP_BOOL_X86 #if defined(_MSC_VER) && CRYPTOPP_BOOL_X86
AS_POP_IF86(di) AS_POP_IF86(di)
AS_POP_IF86(si) AS_POP_IF86(si)

2
x64dll.asm
View File

@ -66,7 +66,7 @@ push_reg r12
.endprolog .endprolog
mov r8, rcx mov r8, rcx
mov r11, ?Te@rdtable@CryptoPP@@3PA_KA mov r11, ?Te@rdtable@CryptoPP@@3PA_KA
mov rdi, QWORD PTR [?g_cacheLineSize@CryptoPP@@3IA] mov edi, DWORD PTR [?g_cacheLineSize@CryptoPP@@3IA]
mov rsi, [(r8+16*19)] mov rsi, [(r8+16*19)]
mov rax, 16 mov rax, 16
and rax, rsi and rax, rsi