wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-05-05 05:54:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5163 from haydenroche5/evp_pkey_derive_guard

Browse Source 
Remove unneeded FIPS guard on wolfSSL_EVP_PKEY_derive.
This commit is contained in:
David Garske
2022-05-20 17:12:24 -07:00
committed by GitHub
parent ec39ee2cb6 a6b948ae59
commit 9a74745246
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wolfcrypt/src/evp.c
-2
View File
@@ -1562,7 +1562,6 @@ int wolfSSL_EVP_PKEY_CTX_ctrl_str(WOLFSSL_EVP_PKEY_CTX *ctx,
#if (!defined(NO_DH) && defined(WOLFSSL_DH_EXTRA)) || defined(HAVE_ECC) || \
defined(HAVE_HKDF)
#if !defined(HAVE_FIPS) || FIPS_VERSION_GT(2,0)
int wolfSSL_EVP_PKEY_derive(WOLFSSL_EVP_PKEY_CTX *ctx, unsigned char *key, size_t *keylen)
{
int len;
@@ -1736,7 +1735,6 @@ int wolfSSL_EVP_PKEY_derive(WOLFSSL_EVP_PKEY_CTX *ctx, unsigned char *key, size_
}
return WOLFSSL_SUCCESS;
}
#endif /* !HAVE_FIPS || HAVE_FIPS_VERSION > 2 */
#endif /* (!NO_DH && WOLFSSL_DH_EXTRA) || HAVE_ECC || HAVE_HKDF */
#ifdef HAVE_HKDF