tls openssl: fixed build error for openssl < 1.1.0

- concerns: 0.9.7 >= OPENSSL_VERSION < 1.1.0
bareos · Oct 2, 2018 · 9764b6b · 9764b6b
1 parent db4474b
commit 9764b6b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/core/src/lib/tls_openssl.cc b/core/src/lib/tls_openssl.cc
@@ -39,7 +39,6 @@
 #include <openssl/x509v3.h>
 
 #include "lib/tls_openssl.h"
-#include "lib/tls_openssl_crl.h"
 #include "lib/tls_openssl_private.h"
 
 #include "parse_conf.h"

diff --git a/core/src/lib/tls_openssl_crl.cc b/core/src/lib/tls_openssl_crl.cc
@@ -27,6 +27,7 @@
 
 #include "include/bareos.h"
 #include "lib/crypto_openssl.h"
+#include "lib/tls_openssl_crl.h"
 #include "lib/bpoll.h"
 #include <assert.h>
 

diff --git a/core/src/lib/tls_openssl_crl.h b/core/src/lib/tls_openssl_crl.h
@@ -28,10 +28,14 @@
 #ifndef BAREOS_LIB_TLS_OPENSSL_CRL_H_
 #define BAREOS_LIB_TLS_OPENSSL_CRL_H_
 
+#if (OPENSSL_VERSION_NUMBER >= 0x00907000L) && (OPENSSL_VERSION_NUMBER < 0x10100000L)
+
 #include <openssl/ssl.h>
 #include <string>
 
 bool SetCertificateRevocationList(const std::string &crlfile, SSL_CTX *openssl_ctx);
 
 
+#endif /* (OPENSSL_VERSION_NUMBER >= 0x00907000L) && (OPENSSL_VERSION_NUMBER < 0x10100000L) */
+
 #endif /* BAREOS_LIB_TLS_OPENSSL_CRL_H_ */
diff --git a/core/src/lib/tls_openssl_private.cc b/core/src/lib/tls_openssl_private.cc
@@ -26,6 +26,7 @@
 
 #include "lib/bpoll.h"
 #include "lib/crypto_openssl.h"
+#include "lib/tls_openssl_crl.h"
 
 #include "lib/parse_conf.h"
 #include "lib/get_tls_psk_by_fqname_callback.h"