mirror of https://github.com/wolfSSL/wolfssl.git
wolfcrypt/src/evp.c: fix a name conflict around "cipherType" that provokes -Wshadow on gcc pre-4v8.
parent
dc2e2631bc
commit
d82a7b10c5
|
@ -6884,7 +6884,7 @@ void wolfSSL_EVP_init(void)
|
||||||
ret = wc_AriaInitCrypt(&ctx->cipher.aria, MC_ALGID_ARIA_256BITKEY);
|
ret = wc_AriaInitCrypt(&ctx->cipher.aria, MC_ALGID_ARIA_256BITKEY);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
WOLFSSL_MSG("Not implemented cipherType");
|
WOLFSSL_MSG("Unimplemented cipherType");
|
||||||
return WOLFSSL_NOT_IMPLEMENTED; /* This should never happen */
|
return WOLFSSL_NOT_IMPLEMENTED; /* This should never happen */
|
||||||
}
|
}
|
||||||
if (ret != 0) {
|
if (ret != 0) {
|
||||||
|
@ -8267,9 +8267,9 @@ void wolfSSL_EVP_init(void)
|
||||||
}
|
}
|
||||||
#endif /* !NO_AES || !NO_DES3 */
|
#endif /* !NO_AES || !NO_DES3 */
|
||||||
|
|
||||||
static int IsCipherTypeAEAD(unsigned char cipherType)
|
static int IsCipherTypeAEAD(unsigned int type)
|
||||||
{
|
{
|
||||||
switch (cipherType) {
|
switch (type) {
|
||||||
case WC_AES_128_GCM_TYPE:
|
case WC_AES_128_GCM_TYPE:
|
||||||
case WC_AES_192_GCM_TYPE:
|
case WC_AES_192_GCM_TYPE:
|
||||||
case WC_AES_256_GCM_TYPE:
|
case WC_AES_256_GCM_TYPE:
|
||||||
|
|
Loading…
Reference in New Issue