From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Fri, 16 Aug 2019 14:21:52 +0000 (+0200)
Subject: dnsdist: Move libssl.hh to pdns/, it's needed for the fuzz target
X-Git-Tag: dnsdist-1.4.0-rc2~13^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9da20db2776d14fe12306ebb663742a54707fab9;p=pdns

dnsdist: Move libssl.hh to pdns/, it's needed for the fuzz target
---

diff --git a/pdns/dnsdistdist/libssl.hh b/pdns/dnsdistdist/libssl.hh
deleted file mode 100644
index 5d2d66fc6..000000000
--- a/pdns/dnsdistdist/libssl.hh
+++ /dev/null
@@ -1,30 +0,0 @@
-#pragma once
-
-#include <map>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "config.h"
-
-#ifdef HAVE_LIBSSL
-#include <openssl/ssl.h>
-
-void registerOpenSSLUser();
-void unregisterOpenSSLUser();
-
-int libssl_ocsp_stapling_callback(SSL* ssl, const std::map<int, std::string>& ocspMap);
-
-std::map<int, std::string> libssl_load_ocsp_responses(const std::vector<std::string>& ocspFiles, std::vector<int> keyTypes);
-int libssl_get_last_key_type(std::unique_ptr<SSL_CTX, void(*)(SSL_CTX*)>& ctx);
-
-#ifdef HAVE_OCSP_BASIC_SIGN
-bool libssl_generate_ocsp_response(const std::string& certFile, const std::string& caCert, const std::string& caKey, const std::string& outFile, int ndays, int nmin);
-#endif
-
-enum class LibsslTLSVersion { TLS10, TLS11, TLS12, TLS13 };
-
-LibsslTLSVersion libssl_tls_version_from_string(const std::string& str);
-bool libssl_set_min_tls_version(std::unique_ptr<SSL_CTX, void(*)(SSL_CTX*)>& ctx, LibsslTLSVersion version);
-
-#endif /* HAVE_LIBSSL */
diff --git a/pdns/dnsdistdist/libssl.hh b/pdns/dnsdistdist/libssl.hh
new file mode 120000
index 000000000..1098684d1
--- /dev/null
+++ b/pdns/dnsdistdist/libssl.hh
@@ -0,0 +1 @@
+../libssl.hh
\ No newline at end of file
diff --git a/pdns/libssl.hh b/pdns/libssl.hh
new file mode 100644
index 000000000..b042fe9cf
--- /dev/null
+++ b/pdns/libssl.hh
@@ -0,0 +1,30 @@
+#pragma once
+
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "config.h"
+
+enum class LibsslTLSVersion { TLS10, TLS11, TLS12, TLS13 };
+
+#ifdef HAVE_LIBSSL
+#include <openssl/ssl.h>
+
+void registerOpenSSLUser();
+void unregisterOpenSSLUser();
+
+int libssl_ocsp_stapling_callback(SSL* ssl, const std::map<int, std::string>& ocspMap);
+
+std::map<int, std::string> libssl_load_ocsp_responses(const std::vector<std::string>& ocspFiles, std::vector<int> keyTypes);
+int libssl_get_last_key_type(std::unique_ptr<SSL_CTX, void(*)(SSL_CTX*)>& ctx);
+
+#ifdef HAVE_OCSP_BASIC_SIGN
+bool libssl_generate_ocsp_response(const std::string& certFile, const std::string& caCert, const std::string& caKey, const std::string& outFile, int ndays, int nmin);
+#endif
+
+LibsslTLSVersion libssl_tls_version_from_string(const std::string& str);
+bool libssl_set_min_tls_version(std::unique_ptr<SSL_CTX, void(*)(SSL_CTX*)>& ctx, LibsslTLSVersion version);
+
+#endif /* HAVE_LIBSSL */