SANTUARIO-588 - Build failure with libressl >= 3.5.0

https://issues.apache.org/jira/browse/SANTUARIO-588

Author: scantor

xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp

@@ -48,7 +48,8 @@ XERCES_CPP_NAMESPACE_USE
 //           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

xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp

@@ -205,7 +205,8 @@ private :
     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 

xsec/enc/OpenSSL/OpenSSLSupport.cpp

@@ -273,7 +273,8 @@ int ECDSA_SIG_set0(ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s)
 
 #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 @@ EVP_ENCODE_CTX
     return mp_ctx;
 }
 
-#endif
+#endif

xsec/enc/OpenSSL/OpenSSLSupport.hpp

@@ -88,7 +88,8 @@ class EvpEncodeCtxRAII
 
 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    
 };