WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

opensslextra fixs and warning for unused variable

pull/1431/head
Jacob Barthelmeh 2018-03-12 18:05:24 -06:00
parent c41bc8205c
commit 8fb3ccacb7
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/ssl.c
View File

@ -29435,20 +29435,25 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl)
#endif /* HAVE_ECC */
/* oidBlkType */
#ifdef WOLFSSL_AES_128
case AES128CBCb:
sName = "AES-128-CBC";
type = oidBlkType;
break;
#endif
#ifdef WOLFSSL_AES_192
case AES192CBCb:
sName = "AES-192-CBC";
type = oidBlkType;
break;
#endif
#ifdef WOLFSSL_AES_256
case AES256CBCb:
sName = "AES-256-CBC";
type = oidBlkType;
break;
#endif
#ifndef NO_DES3
case NID_des:
@ -29607,20 +29612,26 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl)
break;
/* oidKeyWrapType */
#ifdef WOLFSSL_AES_128
case AES128_WRAP:
sName = "AES-128 wrap";
type = oidKeyWrapType;
break;
#endif
#ifdef WOLFSSL_AES_192
case AES192_WRAP:
sName = "AES-192 wrap";
type = oidKeyWrapType;
break;
#endif
#ifdef WOLFSSL_AES_256
case AES256_WRAP:
sName = "AES-256 wrap";
type = oidKeyWrapType;
break;
#endif
/* oidCmsKeyAgreeType */
#ifndef NO_SHA
@ -30203,12 +30214,18 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl)
/* oidKeyWrapType */
case oidKeyWrapType:
switch (oid) {
#ifdef WOLFSSL_AES_128
case AES128_WRAP:
return AES128_WRAP;
#endif
#ifdef WOLFSSL_AES_192
case AES192_WRAP:
return AES192_WRAP;
#endif
#ifdef WOLFSSL_AES_256
case AES256_WRAP:
return AES256_WRAP;
#endif
}
break;

1
wolfcrypt/src/asn.c
View File

@ -2431,6 +2431,7 @@ static int CheckAlgo(int first, int second, int* id, int* version)
< 0 on error */
static int CheckAlgoV2(int oid, int* id)
{
(void)id; /* not used if AES and DES3 disabled */
switch (oid) {
#ifndef NO_DES3
case DESb: