From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Thu, 9 Feb 2023 08:46:02 +0000 (+0100)
Subject: Merge pull request #12423 from fredmorcos/ddist-tls-provider
X-Git-Tag: dnsdist-1.8.0-rc1~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d2c9136b0b8a9b8dc993e3979646c447d782a12;p=thirdparty%2Fpdns.git

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

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

0d2c9136b0b8a9b8dc993e3979646c447d782a12
diff --cc pdns/libssl.cc
index 3e3bdc9220,33d764f494..930273047f
--- a/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};