From 6b04ebe3a4b48404f3bbfebbf860af33a1b1d6a3 Mon Sep 17 00:00:00 2001 From: Jacob Barthelmeh Date: Mon, 12 Mar 2018 16:12:10 -0600 Subject: [PATCH] fix for compiling with different build settings --- src/ssl.c | 8 ++++++++ wolfcrypt/src/asn.c | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/src/ssl.c b/src/ssl.c index 75709d657..22911a1ad 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -30082,16 +30082,24 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl) /* oidBlkType */ case oidBlkType: switch (oid) { + #ifdef WOLFSSL_AES_128 case AES128CBCb: return AES128CBCb; + #endif + #ifdef WOLFSSL_AES_192 case AES192CBCb: return AES192CBCb; + #endif + #ifdef WOLFSSL_AES_256 case AES256CBCb: return AES256CBCb; + #endif + #ifndef NO_DES3 case DESb: return NID_des; case DES3b: return NID_des3; + #endif } break; diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c index d81f8d4b3..48aa63c33 100755 --- a/wolfcrypt/src/asn.c +++ b/wolfcrypt/src/asn.c @@ -2432,15 +2432,19 @@ static int CheckAlgo(int first, int second, int* id, int* version) static int CheckAlgoV2(int oid, int* id) { switch (oid) { +#ifndef NO_DES3 case DESb: *id = PBE_SHA1_DES; return 0; case DES3b: *id = PBE_SHA1_DES3; return 0; +#endif +#ifdef WOLFSSL_AES_256 case AES256CBCb: *id = PBE_AES256_CBC; return 0; +#endif default: return ALGO_ID_E;