Browse Source

[Minor] Use OSSL_PROVIDER_load on RHEL based distros

pull/5189/head
Vsevolod Stakhov 1 year ago
parent
commit
04bcc9fe35
No known key found for this signature in database GPG Key ID: 7647B6790081437
  1. 1
      config.h.in
  2. 1
      rpm/rspamd.spec
  3. 10
      src/libserver/ssl_util.c

1
config.h.in

@ -116,6 +116,7 @@
#cmakedefine WITH_FASTTEXT 1 #cmakedefine WITH_FASTTEXT 1
#cmakedefine BACKWARD_ENABLE 1 #cmakedefine BACKWARD_ENABLE 1
#cmakedefine HAVE_BUILTIN_CPU_SUPPORTS 1 #cmakedefine HAVE_BUILTIN_CPU_SUPPORTS 1
#cmakedefine RSPAMD_LEGACY_SSL_PROVIDER 1
#cmakedefine DISABLE_PTHREAD_MUTEX 1 #cmakedefine DISABLE_PTHREAD_MUTEX 1

1
rpm/rspamd.spec

@ -137,6 +137,7 @@ rm -f %{_builddir}/luajit-build/lib/*.so || true
-DWANT_SYSTEMD_UNITS=ON \ -DWANT_SYSTEMD_UNITS=ON \
-DNO_SHARED=ON \ -DNO_SHARED=ON \
-DNO_TARGET_VERSIONS=1 \ -DNO_TARGET_VERSIONS=1 \
-DRSPAMD_LEGACY_SSL_PROVIDER=1 \
%ifarch x86_64 amd64 arm64 aarch64 %ifarch x86_64 amd64 arm64 aarch64
-DENABLE_HYPERSCAN=ON \ -DENABLE_HYPERSCAN=ON \
%endif %endif

10
src/libserver/ssl_util.c

@ -1,5 +1,5 @@
/*-
* Copyright 2016 Vsevolod Stakhov
/*
* Copyright 2024 Vsevolod Stakhov
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -1054,6 +1054,9 @@ gpointer rspamd_init_ssl_ctx_noverify(void)
return ssl_ctx_noverify; return ssl_ctx_noverify;
} }
#if defined(RSPAMD_LEGACY_SSL_PROVIDER) && OPENSSL_VERSION_NUMBER >= 0x30000000L
#include <openssl/provider.h>
#endif
void rspamd_openssl_maybe_init(void) void rspamd_openssl_maybe_init(void)
{ {
@ -1075,6 +1078,9 @@ void rspamd_openssl_maybe_init(void)
#else #else
OPENSSL_init_ssl(0, NULL); OPENSSL_init_ssl(0, NULL);
#endif #endif
#if defined(RSPAMD_LEGACY_SSL_PROVIDER) && OPENSSL_VERSION_NUMBER >= 0x30000000L
(void) OSSL_PROVIDER_load(NULL, "legacy");
#endif
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
OPENSSL_config(NULL); OPENSSL_config(NULL);

Loading…
Cancel
Save