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

Merge pull request #2488 from aaronjense/openssh-fixes

Browse Source 
Fix defines that aren't in configure.ac
This commit is contained in:
David Garske
2019-10-04 10:35:07 -07:00
committed by GitHub
parent d48e904c16 91222bc887
commit 0d43c1f3d7
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ssl.c
View File

@@ -16299,7 +16299,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
switch (ctx->cipherType) { switch (ctx->cipherType) {
#ifndef NO_AES #ifndef NO_AES
#ifdef WOLFSSL_AES_CBC #ifdef HAVE_AES_CBC
case AES_128_CBC_TYPE : case AES_128_CBC_TYPE :
case AES_192_CBC_TYPE : case AES_192_CBC_TYPE :
case AES_256_CBC_TYPE : case AES_256_CBC_TYPE :
@@ -16307,14 +16307,14 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
XMEMCPY(ctx->iv, &ctx->cipher.aes.reg, AES_BLOCK_SIZE); XMEMCPY(ctx->iv, &ctx->cipher.aes.reg, AES_BLOCK_SIZE);
break; break;
#endif #endif
#ifdef WOLFSSL_AES_GCM #ifdef HAVE_AESGCM
case AES_128_GCM_TYPE : case AES_128_GCM_TYPE :
case AES_192_GCM_TYPE : case AES_192_GCM_TYPE :
case AES_256_GCM_TYPE : case AES_256_GCM_TYPE :
WOLFSSL_MSG("AES GCM"); WOLFSSL_MSG("AES GCM");
XMEMCPY(ctx->iv, &ctx->cipher.aes.reg, AES_BLOCK_SIZE); XMEMCPY(ctx->iv, &ctx->cipher.aes.reg, AES_BLOCK_SIZE);
break; break;
#endif /* WOLFSSL_AES_GCM */ #endif /* HAVE_AESGCM */
#ifdef WOLFSSL_AES_COUNTER #ifdef WOLFSSL_AES_COUNTER
case AES_128_CTR_TYPE : case AES_128_CTR_TYPE :
case AES_192_CTR_TYPE : case AES_192_CTR_TYPE :
@@ -16383,7 +16383,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
XMEMCPY(&ctx->cipher.aes.reg, ctx->iv, AES_BLOCK_SIZE); XMEMCPY(&ctx->cipher.aes.reg, ctx->iv, AES_BLOCK_SIZE);
break; break;
#endif #endif
#ifdef WOLFSSL_AES_GCM #ifdef HAVE_AESGCM
case AES_128_GCM_TYPE : case AES_128_GCM_TYPE :
case AES_192_GCM_TYPE : case AES_192_GCM_TYPE :
case AES_256_GCM_TYPE : case AES_256_GCM_TYPE :

2
wolfcrypt/src/evp.c
View File

@@ -773,7 +773,7 @@ unsigned long WOLFSSL_CIPHER_mode(const WOLFSSL_EVP_CIPHER *cipher)
case AES_256_CBC_TYPE: case AES_256_CBC_TYPE:
return WOLFSSL_EVP_CIPH_CBC_MODE; return WOLFSSL_EVP_CIPH_CBC_MODE;
#endif #endif
#if defined(WOLFSSL_AES_GCM) #if defined(HAVE_AESGCM)
case AES_128_GCM_TYPE: case AES_128_GCM_TYPE:
case AES_192_GCM_TYPE: case AES_192_GCM_TYPE:
case AES_256_GCM_TYPE: case AES_256_GCM_TYPE: