feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

EVP Fix

Browse Source 
Clean up a bad guard check for AES-CTR.
This commit is contained in:
John Safranek
2020-09-22 09:46:27 -07:00
parent fc425b74fc
commit 87d042e37d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wolfcrypt/src/evp.c
View File

@ -133,7 +133,7 @@ enum {
#endif #endif
#endif /* HAVE_AESGCM */ #endif /* HAVE_AESGCM */
#ifdef HAVE_AES_COUNTER #ifdef WOLFSSL_AES_COUNTER
#ifdef WOLFSSL_AES_128 #ifdef WOLFSSL_AES_128
static const char EVP_AES_128_CTR[] = "AES-128-CTR"; static const char EVP_AES_128_CTR[] = "AES-128-CTR";
#endif #endif
@ -2740,7 +2740,7 @@ static const struct cipher{
#endif #endif
#endif #endif
#ifdef HAVE_AES_COUNTER #ifdef WOLFSSL_AES_COUNTER
#ifdef WOLFSSL_AES_128 #ifdef WOLFSSL_AES_128
{AES_128_CTR_TYPE, "AES-128-CTR", NID_aes_128_ctr}, {AES_128_CTR_TYPE, "AES-128-CTR", NID_aes_128_ctr},
#endif #endif
@ -3646,7 +3646,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
#endif /* WOLFSSL_AES_256 */ #endif /* WOLFSSL_AES_256 */
#endif /* HAVE_AESGCM */ #endif /* HAVE_AESGCM */
#ifdef HAVE_AES_CTR #ifdef WOLFSSL_AES_COUNTER
#ifdef WOLFSSL_AES_128 #ifdef WOLFSSL_AES_128
const WOLFSSL_EVP_CIPHER* wolfSSL_EVP_aes_128_ctr(void) const WOLFSSL_EVP_CIPHER* wolfSSL_EVP_aes_128_ctr(void)
{ {
@ -3672,7 +3672,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
return EVP_AES_256_CTR; return EVP_AES_256_CTR;
} }
#endif /* WOLFSSL_AES_256 */ #endif /* WOLFSSL_AES_256 */
#endif /* HAVE_AES_CTR */ #endif /* WOLFSSL_AES_COUNTER */
#ifdef HAVE_AES_ECB #ifdef HAVE_AES_ECB
#ifdef WOLFSSL_AES_128 #ifdef WOLFSSL_AES_128