SANTUARIO-588 - Build failure with libressl >= 3.5.0
https://issues.apache.org/jira/browse/SANTUARIO-588
git-svn-id: https://svn.apache.org/repos/asf/santuario/xml-security-cpp/trunk@1903227 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp b/xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp
index a8ea9f1..a9a84e3 100644
--- a/xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp
+++ b/xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp
@@ -48,7 +48,8 @@
// Construction/Destruction
// --------------------------------------------------------------------------------
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
+ ((defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L))
OpenSSLCryptoBase64::OpenSSLCryptoBase64() : mp_ectx(&m_ectx_store), mp_dctx(&m_dctx_store) { }
OpenSSLCryptoBase64::~OpenSSLCryptoBase64() { }
#else
diff --git a/xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp b/xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp
index 82aeb0a..7c947d5 100644
--- a/xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp
+++ b/xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp
@@ -205,7 +205,8 @@
EVP_ENCODE_CTX *mp_ectx; // Encode context
EVP_ENCODE_CTX *mp_dctx; // Decode context
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
+ ((defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L))
EVP_ENCODE_CTX m_ectx_store;
EVP_ENCODE_CTX m_dctx_store;
#endif
diff --git a/xsec/enc/OpenSSL/OpenSSLSupport.cpp b/xsec/enc/OpenSSL/OpenSSLSupport.cpp
index cf874f8..c445300 100644
--- a/xsec/enc/OpenSSL/OpenSSLSupport.cpp
+++ b/xsec/enc/OpenSSL/OpenSSLSupport.cpp
@@ -273,7 +273,8 @@
#endif
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
+ ((defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L))
EvpEncodeCtxRAII::EvpEncodeCtxRAII() : mp_ctx(&mp_ctx_store) { };
EvpEncodeCtxRAII::~EvpEncodeCtxRAII() { }
#else
@@ -289,4 +290,4 @@
return mp_ctx;
}
-#endif
\ No newline at end of file
+#endif
diff --git a/xsec/enc/OpenSSL/OpenSSLSupport.hpp b/xsec/enc/OpenSSL/OpenSSLSupport.hpp
index b5f67f2..09d5089 100644
--- a/xsec/enc/OpenSSL/OpenSSLSupport.hpp
+++ b/xsec/enc/OpenSSL/OpenSSLSupport.hpp
@@ -88,7 +88,8 @@
private:
EVP_ENCODE_CTX *mp_ctx;
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
+ ((defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L))
EVP_ENCODE_CTX mp_ctx_store;
#endif
};
