Merge pull request #12423 from fredmorcos/ddist-tls-provider

OpenSSL 3.0: Offer TLS providers as an alternative to TLS engines in DNSdist

diff --cc pdns/dnsdist-console.cc
Simple merge

diff --cc pdns/dnsdist-lua.cc
Simple merge

diff --cc pdns/dnsdistdist/configure.ac
Simple merge

diff --cc pdns/dnsdistdist/docs/reference/config.rst
Simple merge

diff --cc pdns/libssl.cc
index 3e3bdc9220cb15866f3444b3c919b6456b64fb3d,33d764f4946892f2abd0550063d09eda57a8f0f7..930273047fd39e2dacd0e39b6ba6c81779dea116
--- 1/pdns/libssl.cc
--- 2/pdns/libssl.cc
+++ b/pdns/libssl.cc
@@@ -79,9 -80,15 +80,15 @@@ static void openssl_thread_cleanup(
  #endif /* (OPENSSL_VERSION_NUMBER < 0x1010000fL || (defined LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2090100fL) */
  
  static std::atomic<uint64_t> s_users;
+ 
+ #if OPENSSL_VERSION_MAJOR >= 3 && defined(HAVE_TLS_PROVIDERS)
+ static LockGuarded<std::unordered_map<std::string, std::unique_ptr<OSSL_PROVIDER, decltype(&OSSL_PROVIDER_unload)>>> s_providers;
+ #else
  #ifndef OPENSSL_NO_ENGINE
 -static LockGuarded<std::unordered_map<std::string, std::unique_ptr<ENGINE, int(*)(ENGINE*)>>> s_engines;
 +static LockGuarded<std::unordered_map<std::string, std::unique_ptr<ENGINE, decltype(&ENGINE_free)>>> s_engines;
  #endif
+ #endif
+ 
  static int s_ticketsKeyIndex{-1};
  static int s_countersIndex{-1};
  static int s_keyLogIndex{-1};

diff --cc pdns/libssl.hh
Simple merge