feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests 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

7
tests/api.c
View File

@@ -46426,7 +46426,6 @@ static void test_wolfSSL_OCSP_resp_get0(void)
static void test_wolfSSL_EVP_PKEY_derive(void) static void test_wolfSSL_EVP_PKEY_derive(void)
{ {
#if defined(OPENSSL_ALL) || defined(WOLFSSL_QT) || defined(WOLFSSL_OPENSSH) #if defined(OPENSSL_ALL) || defined(WOLFSSL_QT) || defined(WOLFSSL_OPENSSH)
#if !defined(HAVE_FIPS) || FIPS_VERSION_GT(2, 0)
#if (!defined(NO_DH) && defined(WOLFSSL_DH_EXTRA)) || defined(HAVE_ECC) #if (!defined(NO_DH) && defined(WOLFSSL_DH_EXTRA)) || defined(HAVE_ECC)
EVP_PKEY_CTX *ctx; EVP_PKEY_CTX *ctx;
@@ -46483,7 +46482,6 @@ static void test_wolfSSL_EVP_PKEY_derive(void)
printf(resultFmt, "passed"); printf(resultFmt, "passed");
#endif /* (!NO_DH && WOLFSSL_DH_EXTRA) || HAVE_ECC */ #endif /* (!NO_DH && WOLFSSL_DH_EXTRA) || HAVE_ECC */
#endif /* !HAVE_FIPS || HAVE_FIPS_VERSION > 2 */
#endif /* OPENSSL_ALL || WOLFSSL_QT || WOLFSSL_OPENSSH */ #endif /* OPENSSL_ALL || WOLFSSL_QT || WOLFSSL_OPENSSH */
} }
@@ -50505,8 +50503,7 @@ static void test_wolfssl_EVP_chacha20_poly1305(void)
static void test_wolfSSL_EVP_PKEY_hkdf(void) static void test_wolfSSL_EVP_PKEY_hkdf(void)
{ {
#if defined(OPENSSL_EXTRA) && defined(HAVE_HKDF) && (!defined(HAVE_FIPS) || \ #if defined(OPENSSL_EXTRA) && defined(HAVE_HKDF)
FIPS_VERSION_GT(2,0))
EVP_PKEY_CTX* ctx; EVP_PKEY_CTX* ctx;
byte salt[] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, byte salt[] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F}; 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F};
@@ -50616,7 +50613,7 @@ static void test_wolfSSL_EVP_PKEY_hkdf(void)
EVP_PKEY_CTX_free(ctx); EVP_PKEY_CTX_free(ctx);
printf(resultFmt, passed); printf(resultFmt, passed);
#endif /* OPENSSL_EXTRA && HAVE_HKDF && (!HAVE_FIPS || HAVE_FIPS_VERSION > 2) */ #endif /* OPENSSL_EXTRA && HAVE_HKDF */
} }
#ifndef NO_BIO #ifndef NO_BIO

2
wolfcrypt/src/evp.c
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) || \ #if (!defined(NO_DH) && defined(WOLFSSL_DH_EXTRA)) || defined(HAVE_ECC) || \
defined(HAVE_HKDF) 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 wolfSSL_EVP_PKEY_derive(WOLFSSL_EVP_PKEY_CTX *ctx, unsigned char *key, size_t *keylen)
{ {
int len; int len;
@@ -1736,7 +1735,6 @@ int wolfSSL_EVP_PKEY_derive(WOLFSSL_EVP_PKEY_CTX *ctx, unsigned char *key, size_
} }
return WOLFSSL_SUCCESS; return WOLFSSL_SUCCESS;
} }
#endif /* !HAVE_FIPS || HAVE_FIPS_VERSION > 2 */
#endif /* (!NO_DH && WOLFSSL_DH_EXTRA) || HAVE_ECC || HAVE_HKDF */ #endif /* (!NO_DH && WOLFSSL_DH_EXTRA) || HAVE_ECC || HAVE_HKDF */
#ifdef HAVE_HKDF #ifdef HAVE_HKDF