fix for compiling with different build settings

This commit is contained in:
Jacob Barthelmeh 2018-03-12 16:12:10 -06:00
parent fa21fb4a27
commit 6b04ebe3a4
2 changed files with 12 additions and 0 deletions

View File

@ -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;

View File

@ -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;