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

fix for compiling with different build settings

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ssl.c
View File

@@ -30082,16 +30082,24 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl)
/* oidBlkType */ /* oidBlkType */
case oidBlkType: case oidBlkType:
switch (oid) { switch (oid) {
#ifdef WOLFSSL_AES_128
case AES128CBCb: case AES128CBCb:
return AES128CBCb; return AES128CBCb;
#endif
#ifdef WOLFSSL_AES_192
case AES192CBCb: case AES192CBCb:
return AES192CBCb; return AES192CBCb;
#endif
#ifdef WOLFSSL_AES_256
case AES256CBCb: case AES256CBCb:
return AES256CBCb; return AES256CBCb;
#endif
#ifndef NO_DES3
case DESb: case DESb:
return NID_des; return NID_des;
case DES3b: case DES3b:
return NID_des3; return NID_des3;
#endif
} }
break; break;

4
wolfcrypt/src/asn.c
View File

@@ -2432,15 +2432,19 @@ static int CheckAlgo(int first, int second, int* id, int* version)
static int CheckAlgoV2(int oid, int* id) static int CheckAlgoV2(int oid, int* id)
{ {
switch (oid) { switch (oid) {
#ifndef NO_DES3
case DESb: case DESb:
*id = PBE_SHA1_DES; *id = PBE_SHA1_DES;
return 0; return 0;
case DES3b: case DES3b:
*id = PBE_SHA1_DES3; *id = PBE_SHA1_DES3;
return 0; return 0;
#endif
#ifdef WOLFSSL_AES_256
case AES256CBCb: case AES256CBCb:
*id = PBE_AES256_CBC; *id = PBE_AES256_CBC;
return 0; return 0;
#endif
default: default:
return ALGO_ID_E; return ALGO_ID_E;