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

opensslextra fixs and warning for unused variable

Browse Source
This commit is contained in:
Jacob Barthelmeh
2018-03-12 18:05:24 -06:00
parent c41bc8205c
commit 8fb3ccacb7
2 changed files with 19 additions and 1 deletions
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 */ #endif /* HAVE_ECC */
/* oidBlkType */ /* oidBlkType */
#ifdef WOLFSSL_AES_128
case AES128CBCb: case AES128CBCb:
sName = "AES-128-CBC"; sName = "AES-128-CBC";
type = oidBlkType; type = oidBlkType;
break; break;
#endif
#ifdef WOLFSSL_AES_192
case AES192CBCb: case AES192CBCb:
sName = "AES-192-CBC"; sName = "AES-192-CBC";
type = oidBlkType; type = oidBlkType;
break; break;
#endif
#ifdef WOLFSSL_AES_256
case AES256CBCb: case AES256CBCb:
sName = "AES-256-CBC"; sName = "AES-256-CBC";
type = oidBlkType; type = oidBlkType;
break; break;
#endif
#ifndef NO_DES3 #ifndef NO_DES3
case NID_des: case NID_des:
@@ -29607,20 +29612,26 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl)
break; break;
/* oidKeyWrapType */ /* oidKeyWrapType */
#ifdef WOLFSSL_AES_128
case AES128_WRAP: case AES128_WRAP:
sName = "AES-128 wrap"; sName = "AES-128 wrap";
type = oidKeyWrapType; type = oidKeyWrapType;
break; break;
#endif
#ifdef WOLFSSL_AES_192
case AES192_WRAP: case AES192_WRAP:
sName = "AES-192 wrap"; sName = "AES-192 wrap";
type = oidKeyWrapType; type = oidKeyWrapType;
break; break;
#endif
#ifdef WOLFSSL_AES_256
case AES256_WRAP: case AES256_WRAP:
sName = "AES-256 wrap"; sName = "AES-256 wrap";
type = oidKeyWrapType; type = oidKeyWrapType;
break; break;
#endif
/* oidCmsKeyAgreeType */ /* oidCmsKeyAgreeType */
#ifndef NO_SHA #ifndef NO_SHA
@@ -30203,12 +30214,18 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl)
/* oidKeyWrapType */ /* oidKeyWrapType */
case oidKeyWrapType: case oidKeyWrapType:
switch (oid) { switch (oid) {
#ifdef WOLFSSL_AES_128
case AES128_WRAP: case AES128_WRAP:
return AES128_WRAP; return AES128_WRAP;
#endif
#ifdef WOLFSSL_AES_192
case AES192_WRAP: case AES192_WRAP:
return AES192_WRAP; return AES192_WRAP;
#endif
#ifdef WOLFSSL_AES_256
case AES256_WRAP: case AES256_WRAP:
return AES256_WRAP; return AES256_WRAP;
#endif
} }
break; 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 */ < 0 on error */
static int CheckAlgoV2(int oid, int* id) static int CheckAlgoV2(int oid, int* id)
{ {
(void)id; /* not used if AES and DES3 disabled */
switch (oid) { switch (oid) {
#ifndef NO_DES3 #ifndef NO_DES3
case DESb: case DESb: