crypto-util: prefer openssl-4
Fedora has switched to openssl 4, and we generate a Requires dependency on libcrypto for the systemd-udev subpackage, so preferring openssl-3 does the wrong thing. So the order in the dlopen note needs to be switched. But in general, we want to get rid of openssl-3, so we want to load openssl-4 in preference. Change the order in both places. (The "compat" order can stay in 261-stable for other distros.)
This commit is contained in:
committed by
Luca Boccassi
parent
eff0d1163c
commit
c0da88f8d9
@@ -339,8 +339,7 @@ int dlopen_libcrypto(int log_level) {
|
||||
|
||||
LIBCRYPTO_NOTE(SD_ELF_NOTE_DLOPEN_PRIORITY_SUGGESTED);
|
||||
|
||||
// FIXME: switch order to prefer libcrypto.so.4 in a future version once it has stabilized
|
||||
FOREACH_STRING(soname, "libcrypto.so.3", "libcrypto.so.4") {
|
||||
FOREACH_STRING(soname, "libcrypto.so.4", "libcrypto.so.3") {
|
||||
r = dlopen_many_sym_or_warn(
|
||||
&libcrypto_dl,
|
||||
soname,
|
||||
|
||||
@@ -37,7 +37,7 @@ int dlopen_libcrypto(int log_level);
|
||||
SD_ELF_NOTE_DLOPEN("libcrypto", \
|
||||
"Support for cryptographic operations", \
|
||||
priority, \
|
||||
"libcrypto.so.3", "libcrypto.so.4")
|
||||
"libcrypto.so.4", "libcrypto.so.3")
|
||||
|
||||
#define DLOPEN_LIBCRYPTO(log_level, priority) \
|
||||
({ \
|
||||
|
||||
Reference in New Issue
Block a user