wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-05 21:54:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

only compile in the AES-CBC decrypt-by-size variant selected by define, default by 8 blocks at a time

Browse Source
This commit is contained in:
John Safranek
2016-04-13 12:00:53 -07:00
parent 451fd878f9
commit 13f002f186
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wolfcrypt/src/aes.c
View File

@@ -1094,12 +1094,12 @@ void AES_CBC_encrypt(const unsigned char* in, unsigned char* out,
XASM_LINK("AES_CBC_encrypt"); XASM_LINK("AES_CBC_encrypt");
#ifdef HAVE_AES_DECRYPT #ifdef HAVE_AES_DECRYPT
#if defined(HAVE_AES_DECRYPT_BY8) #if defined(WOLFSSL_AESNI_BY4)
void AES_CBC_decrypt(const unsigned char* in, unsigned char* out, void AES_CBC_decrypt(const unsigned char* in, unsigned char* out,
unsigned char* ivec, unsigned long length, unsigned char* ivec, unsigned long length,
const unsigned char* KS, int nr) const unsigned char* KS, int nr)
XASM_LINK("AES_CBC_decrypt_by8"); XASM_LINK("AES_CBC_decrypt_by4");
#elif defined(HAVE_AES_DECRYPT_BY6) #elif defined(WOLFSSL_AESNI_BY6)
void AES_CBC_decrypt(const unsigned char* in, unsigned char* out, void AES_CBC_decrypt(const unsigned char* in, unsigned char* out,
unsigned char* ivec, unsigned long length, unsigned char* ivec, unsigned long length,
const unsigned char* KS, int nr) const unsigned char* KS, int nr)
@@ -1108,8 +1108,8 @@ void AES_CBC_decrypt(const unsigned char* in, unsigned char* out,
void AES_CBC_decrypt(const unsigned char* in, unsigned char* out, void AES_CBC_decrypt(const unsigned char* in, unsigned char* out,
unsigned char* ivec, unsigned long length, unsigned char* ivec, unsigned long length,
const unsigned char* KS, int nr) const unsigned char* KS, int nr)
XASM_LINK("AES_CBC_decrypt"); XASM_LINK("AES_CBC_decrypt_by8");
#endif /* HAVE_AES_DECRYPT_BYX */ #endif /* WOLFSSL_AESNI_BYx */
#endif /* HAVE_AES_DECRYPT */ #endif /* HAVE_AES_DECRYPT */
#endif /* HAVE_AES_CBC */ #endif /* HAVE_AES_CBC */

12
wolfcrypt/src/aes_asm.s
View File

@@ -86,18 +86,18 @@ jne LOOP
ret ret
#if defined(WOLFSSL_AESNI_BY4)
/* /*
AES_CBC_decrypt (const unsigned char *in, AES_CBC_decrypt_by4 (const unsigned char *in,
unsigned char *out, unsigned char *out,
unsigned char ivec[16], unsigned char ivec[16],
unsigned long length, unsigned long length,
const unsigned char *KS, const unsigned char *KS,
int nr) int nr)
*/ */
.globl AES_CBC_decrypt .globl AES_CBC_decrypt_by4
AES_CBC_decrypt: AES_CBC_decrypt_by4:
# parameter 1: %rdi # parameter 1: %rdi
# parameter 2: %rsi # parameter 2: %rsi
# parameter 3: %rdx # parameter 3: %rdx
@@ -262,6 +262,7 @@ DLAST_4_2:
DEND_4: DEND_4:
ret ret
#elif defined(WOLFSSL_AESNI_BY6)
/* /*
AES_CBC_decrypt_by6 (const unsigned char *in, AES_CBC_decrypt_by6 (const unsigned char *in,
@@ -484,6 +485,7 @@ ELAST_6_2:
EEND_6: EEND_6:
ret ret
#else /* WOLFSSL_AESNI_BYx */
/* /*
AES_CBC_decrypt_by8 (const unsigned char *in, AES_CBC_decrypt_by8 (const unsigned char *in,
@@ -734,6 +736,8 @@ ELAST_8_2:
EEND_8: EEND_8:
ret ret
#endif /* WOLFSSL_AESNI_BYx */
/* /*
AES_ECB_encrypt (const unsigned char *in, AES_ECB_encrypt (const unsigned char *in,