From: Christian Hofstaedtler <zeha@debian.org>
Date: Mon, 27 Jun 2016 13:50:31 +0000 (+0000)
Subject: opensslsigners: remove thread/locking setup, not needed in openssl 1.1 anymore
X-Git-Tag: auth-4.0.1^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d366601faf1bab236f864967cd588693ab6de718;p=pdns

opensslsigners: remove thread/locking setup, not needed in openssl 1.1 anymore
---

diff --git a/pdns/opensslsigners.cc b/pdns/opensslsigners.cc
index db2bbedbf..d82b2f45d 100644
--- a/pdns/opensslsigners.cc
+++ b/pdns/opensslsigners.cc
@@ -8,12 +8,12 @@
 #include <openssl/sha.h>
 #include <openssl/rand.h>
 #include <openssl/rsa.h>
+#include <openssl/opensslv.h>
 #include "opensslsigners.hh"
 #include "dnssecinfra.hh"
 
-
-/* pthread locking */
-
+#if OPENSSL_VERSION_NUMBER < 0x1010000fL
+/* OpenSSL < 1.1.0 needs support for threading/locking in the calling application. */
 static pthread_mutex_t *openssllocks;
 
 extern "C" {
@@ -54,7 +54,10 @@ void openssl_thread_cleanup()
 
   OPENSSL_free(openssllocks);
 }
-
+#else
+void openssl_thread_setup() {}
+void openssl_thread_cleanup() {}
+#endif
 
 /* seeding PRNG */