feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

fixes for OPENSSL_COEXIST with FIPS and with/without TEST_OPENSSL_COEXIST.

Browse Source
This commit is contained in:
Daniel Pouzzner
2024-11-26 19:38:10 -06:00
parent 5e13fc2c84
commit b65d3fff56
3 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wolfcrypt/test/test.c
View File

@ -24986,7 +24986,7 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t openssl_test(void)
#if defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION > 2) #if defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION > 2)
/* Expect failure with MD5 + HMAC when using FIPS 140-3. */ /* Expect failure with MD5 + HMAC when using FIPS 140-3. */
if (HMAC(EVP_md5(), "JefeJefeJefeJefe", 16, (byte*)c.input, (int)c.inLen, if (wolfSSL_HMAC(wolfSSL_EVP_md5(), "JefeJefeJefeJefe", 16, (byte*)c.input, (int)c.inLen,
hash, 0) != NULL) hash, 0) != NULL)
#else #else
if (wolfSSL_HMAC(wolfSSL_EVP_md5(), "JefeJefeJefeJefe", 16, (byte*)c.input, (int)c.inLen, if (wolfSSL_HMAC(wolfSSL_EVP_md5(), "JefeJefeJefeJefe", 16, (byte*)c.input, (int)c.inLen,

9
wolfssl/ssl.h
View File

@ -117,6 +117,9 @@
#include <openssl/hmac.h> #include <openssl/hmac.h>
#include <openssl/bn.h> #include <openssl/bn.h>
#include <openssl/crypto.h> #include <openssl/crypto.h>
#if !defined(HAVE_SELFTEST) && (!defined(HAVE_FIPS) || \
FIPS_VERSION3_GE(5,2,0))
#include <openssl/aes.h> #include <openssl/aes.h>
#include <openssl/blowfish.h> #include <openssl/blowfish.h>
#include <openssl/camellia.h> #include <openssl/camellia.h>
@ -163,6 +166,10 @@
#include <openssl/rc5.h> #include <openssl/rc5.h>
#include <openssl/ripemd.h> #include <openssl/ripemd.h>
#include <openssl/rsa.h> #include <openssl/rsa.h>
#if defined(HAVE_FIPS_VERSION) && FIPS_VERSION3_LT(7,0,0)
/* clear conflicting name */
#undef RSA_PKCS1_PADDING_SIZE
#endif
#include <openssl/seed.h> #include <openssl/seed.h>
#include <openssl/self_test.h> #include <openssl/self_test.h>
#include <openssl/sha.h> #include <openssl/sha.h>
@ -173,6 +180,8 @@
#include <openssl/txt_db.h> #include <openssl/txt_db.h>
#include <openssl/ui.h> #include <openssl/ui.h>
#include <openssl/whrlpool.h> #include <openssl/whrlpool.h>
#endif /* !HAVE_SELFTEST && (!HAVE_FIPS || FIPS_VERSION3_GE(5,2,0)) */
#endif #endif
#elif (defined(OPENSSL_EXTRA) || defined(OPENSSL_EXTRA_X509_SMALL)) #elif (defined(OPENSSL_EXTRA) || defined(OPENSSL_EXTRA_X509_SMALL))

5
wolfssl/wolfcrypt/settings.h
View File

@ -3660,6 +3660,11 @@ extern void uITRON4_free(void *p) ;
#ifndef NO_OLD_WC_NAMES #ifndef NO_OLD_WC_NAMES
#define NO_OLD_WC_NAMES #define NO_OLD_WC_NAMES
#endif #endif
#if defined(HAVE_SELFTEST) || \
(defined(HAVE_FIPS) && FIPS_VERSION3_LT(5,0,0))
/* old FIPS needs this remapping. */
#define Sha3 wc_Sha3
#endif
#endif #endif
#if defined(NO_OLD_WC_NAMES) || defined(OPENSSL_EXTRA) #if defined(NO_OLD_WC_NAMES) || defined(OPENSSL_EXTRA)