You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by sc...@apache.org on 2022/08/04 13:41:45 UTC
svn commit: r1903227 - in /santuario/xml-security-cpp/trunk/xsec/enc/OpenSSL: OpenSSLCryptoBase64.cpp OpenSSLCryptoBase64.hpp OpenSSLSupport.cpp OpenSSLSupport.hpp
Author: scantor
Date: Thu Aug 4 13:41:45 2022
New Revision: 1903227
URL: http://svn.apache.org/viewvc?rev=1903227&view=rev
Log:
SANTUARIO-588 - Build failure with libressl >= 3.5.0
https://issues.apache.org/jira/browse/SANTUARIO-588
Modified:
santuario/xml-security-cpp/trunk/xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp
santuario/xml-security-cpp/trunk/xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp
santuario/xml-security-cpp/trunk/xsec/enc/OpenSSL/OpenSSLSupport.cpp
santuario/xml-security-cpp/trunk/xsec/enc/OpenSSL/OpenSSLSupport.hpp
Modified: santuario/xml-security-cpp/trunk/xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp?rev=1903227&r1=1903226&r2=1903227&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp Thu Aug 4 13:41:45 2022
@@ -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
Modified: santuario/xml-security-cpp/trunk/xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp?rev=1903227&r1=1903226&r2=1903227&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp Thu Aug 4 13:41:45 2022
@@ -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
Modified: santuario/xml-security-cpp/trunk/xsec/enc/OpenSSL/OpenSSLSupport.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/enc/OpenSSL/OpenSSLSupport.cpp?rev=1903227&r1=1903226&r2=1903227&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/enc/OpenSSL/OpenSSLSupport.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/enc/OpenSSL/OpenSSLSupport.cpp Thu Aug 4 13:41:45 2022
@@ -273,7 +273,8 @@ int ECDSA_SIG_set0(ECDSA_SIG *sig, BIGNU
#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
\ No newline at end of file
+#endif
Modified: santuario/xml-security-cpp/trunk/xsec/enc/OpenSSL/OpenSSLSupport.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/enc/OpenSSL/OpenSSLSupport.hpp?rev=1903227&r1=1903226&r2=1903227&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/enc/OpenSSL/OpenSSLSupport.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/enc/OpenSSL/OpenSSLSupport.hpp Thu Aug 4 13:41:45 2022
@@ -88,7 +88,8 @@ public:
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
};