KekenoBSD/src
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

heimdal: fix wrt OpenSSL 3.5

Browse Source 
- Bump the library version.
- Don't load the legacy provider.  It is no longer enabled by default
  and looks like kdc doesn't actually need it.

Reviewed by:		cy
Differential Revision:	https://reviews.freebsd.org/D52114
This commit is contained in:
Gleb Smirnoff
2025-08-25 10:12:52 -07:00
parent 2b74ff5fce
commit 9ab31f821a
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kerberos5/lib/libroken/fbsd_ossl_provider_load.c
+1 -6
View File
@@ -5,10 +5,9 @@
#include <openssl/provider.h> #include <openssl/provider.h>
#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3) #if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3)
#define CRYPTO_LIBRARY "/lib/libcrypto.so.30" #define CRYPTO_LIBRARY "/lib/libcrypto.so.35"
static void fbsd_ossl_provider_unload(void); static void fbsd_ossl_provider_unload(void);
static void print_dlerror(char *); static void print_dlerror(char *);
static OSSL_PROVIDER *legacy;
static OSSL_PROVIDER *deflt; static OSSL_PROVIDER *deflt;
static int providers_loaded = 0; static int providers_loaded = 0;
static OSSL_PROVIDER * (*ossl_provider_load)(OSSL_LIB_CTX *, const char*) = NULL; static OSSL_PROVIDER * (*ossl_provider_load)(OSSL_LIB_CTX *, const char*) = NULL;
@@ -25,7 +24,6 @@ fbsd_ossl_provider_unload(void)
} }
} }
if (providers_loaded == 1) { if (providers_loaded == 1) {
(*ossl_provider_unload)(legacy);
(*ossl_provider_unload)(deflt); (*ossl_provider_unload)(deflt);
providers_loaded = 0; providers_loaded = 0;
} }
@@ -61,10 +59,7 @@ fbsd_ossl_provider_load(void)
} }
if (providers_loaded == 0) { if (providers_loaded == 0) {
if ((legacy = (*ossl_provider_load)(NULL, "legacy")) == NULL)
return (EINVAL);
if ((deflt = (*ossl_provider_load)(NULL, "default")) == NULL) { if ((deflt = (*ossl_provider_load)(NULL, "default")) == NULL) {
(*ossl_provider_unload)(legacy);
return (EINVAL); return (EINVAL);
} }
if (atexit(fbsd_ossl_provider_unload)) { if (atexit(fbsd_ossl_provider_unload)) {