--- a/src/main/tls.c
+++ b/src/main/tls.c
-@@ -956,7 +956,7 @@ after_chain:
+@@ -848,7 +848,7 @@ after_chain:
}
if (vp) vp->vp_integer = state->mtu;
return state;
}
-@@ -4515,7 +4515,7 @@ post_ca:
+@@ -4496,7 +4496,7 @@ post_ca:
/*
* Callbacks, etc. for session resumption.
*/
/*
* Cache sessions on disk if requested.
*/
-@@ -4595,7 +4595,7 @@ post_ca:
+@@ -4576,7 +4576,7 @@ post_ca:
/*
* Setup session caching
*/
/*
* Create a unique context Id per EAP-TLS configuration.
*/
-@@ -4883,7 +4883,7 @@ fr_tls_server_conf_t *tls_server_conf_pa
+@@ -4864,7 +4864,7 @@ fr_tls_server_conf_t *tls_server_conf_pa
goto error;
}
--- a/src/main/threads.c
+++ b/src/main/threads.c
-@@ -265,6 +265,7 @@ static void ssl_locking_function(int mod
+@@ -275,6 +275,7 @@ static void ssl_locking_function(int mod
*/
int tls_mutexes_init(void)
{
int i, num;
rad_assert(ssl_mutexes == NULL);
-@@ -282,6 +283,7 @@ int tls_mutexes_init(void)
+@@ -292,6 +293,7 @@ int tls_mutexes_init(void)
}
CRYPTO_set_locking_callback(ssl_locking_function);
}
--- a/src/main/tls.c
+++ b/src/main/tls.c
-@@ -60,6 +60,7 @@ USES_APPLE_DEPRECATED_API /* OpenSSL API
+@@ -59,6 +59,7 @@ USES_APPLE_DEPRECATED_API /* OpenSSL API
# include <openssl/evp.h>
# endif
# include <openssl/ssl.h>
#if OPENSSL_VERSION_NUMBER >= 0x30000000L
# include <openssl/provider.h>
-@@ -2996,7 +2997,7 @@ int cbtls_verify(int ok, X509_STORE_CTX
+@@ -2929,7 +2930,7 @@ int cbtls_verify(int ok, X509_STORE_CTX
int my_ok = ok;
ASN1_INTEGER *sn = NULL;
VALUE_PAIR **certs;
char **identity;
#ifdef HAVE_OPENSSL_OCSP_H
-@@ -3087,7 +3088,7 @@ int cbtls_verify(int ok, X509_STORE_CTX
+@@ -3021,7 +3022,7 @@ int cbtls_verify(int ok, X509_STORE_CTX
* Get the Expiration Date
*/
buf[0] = '\0';
if (certs && (lookup <= 1) && asn_time &&
(asn_time->length < (int) sizeof(buf))) {
memcpy(buf, (char*) asn_time->data, asn_time->length);
-@@ -3100,7 +3101,7 @@ int cbtls_verify(int ok, X509_STORE_CTX
+@@ -3034,7 +3035,7 @@ int cbtls_verify(int ok, X509_STORE_CTX
* Get the Valid Since Date
*/
buf[0] = '\0';
if (certs && (lookup <= 1) && asn_time &&
(asn_time->length < (int) sizeof(buf))) {
memcpy(buf, (char*) asn_time->data, asn_time->length);
-@@ -3664,10 +3665,12 @@ static int set_ecdh_curve(SSL_CTX *ctx,
+@@ -3638,10 +3639,12 @@ static int set_ecdh_curve(SSL_CTX *ctx,
*/
int tls_global_init(TLS_UNUSED bool spawn_flag, TLS_UNUSED bool check)
{
CONF_modules_load_file(NULL, NULL, 0);
+#endif
- /*
- * Initialize the index for the certificates.
-@@ -3767,6 +3770,7 @@ int tls_global_version_check(char const
+ #if OPENSSL_VERSION_NUMBER >= 0x30000000L
+ EVP_set_default_properties(NULL, "fips=no");
+@@ -3745,6 +3748,7 @@ int tls_global_version_check(char const
*/
void tls_global_cleanup(void)
{
#if OPENSSL_VERSION_NUMBER < 0x10000000L
ERR_remove_state(0);
#elif OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-@@ -3792,6 +3796,7 @@ void tls_global_cleanup(void)
+@@ -3770,6 +3774,7 @@ void tls_global_cleanup(void)
ERR_free_strings();
EVP_cleanup();
CRYPTO_cleanup_all_ex_data();
+ ssl_linked = OpenSSL_version_num();
/*
- * Major and minor versions mismatch, that's bad.
-@@ -152,7 +152,7 @@ char const *ssl_version_num(void)
+ * Major mismatch, that's bad.
+@@ -165,7 +165,7 @@ char const *ssl_version_num(void)
{
long ssl_linked;
return ssl_version_by_num((uint32_t)ssl_linked);
}
-@@ -188,10 +188,10 @@ char const *ssl_version(void)
+@@ -201,10 +201,10 @@ char const *ssl_version(void)
{
static char buffer[256];