summaryrefslogtreecommitdiff
path: root/xmlsecurity/source
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2021-04-23 10:04:29 +0200
committerThorsten Behrens <thorsten.behrens@allotropia.de>2021-05-05 21:14:30 +0200
commit013ddc4f5307df512767ca23b3922540b2b36d52 (patch)
tree2bff87fd1dcdcd8dc99358ba1ddaee606dd38b08 /xmlsecurity/source
parent983c41278899674028040c70c6e6415574b701f1 (diff)
Switch OPENSSL config var from negative to positive
- align with most of the rest of config_host - rename DISABLE_OPENSSL to ENABLE_OPENSSL - make this configurable Change-Id: Ic3b41fcdda38db66134939f12265e0da24833d60 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114564 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Diffstat (limited to 'xmlsecurity/source')
-rw-r--r--xmlsecurity/source/xmlsec/xmlsec_init.cxx12
1 files changed, 8 insertions, 4 deletions
diff --git a/xmlsecurity/source/xmlsec/xmlsec_init.cxx b/xmlsecurity/source/xmlsec/xmlsec_init.cxx
index 7e8c58ddeec3..410408ed2ebe 100644
--- a/xmlsecurity/source/xmlsec/xmlsec_init.cxx
+++ b/xmlsecurity/source/xmlsec/xmlsec_init.cxx
@@ -17,7 +17,8 @@
#include <xmlsec/xmlstreamio.hxx>
#ifdef XMLSEC_CRYPTO_MSCRYPTO
#include <xmlsec/mscng/crypto.h>
-#else
+#endif
+#ifdef XMLSEC_CRYPTO_NSS
#include <xmlsec/nss/crypto.h>
#endif
@@ -36,7 +37,8 @@ XSECXMLSEC_DLLPUBLIC void initXmlSec()
xmlSecShutdown();
throw RuntimeException();
}
-#else
+#endif
+#ifdef XMLSEC_CRYPTO_NSS
if( xmlSecNssInit() < 0 ) {
xmlSecShutdown();
throw RuntimeException();
@@ -47,7 +49,8 @@ XSECXMLSEC_DLLPUBLIC void initXmlSec()
if( xmlEnableStreamInputCallbacks() < 0 ) {
#ifdef XMLSEC_CRYPTO_MSCRYPTO
xmlSecMSCngShutdown();
-#else
+#endif
+#ifdef XMLSEC_CRYPTO_NSS
xmlSecNssShutdown();
#endif
xmlSecShutdown() ;
@@ -60,7 +63,8 @@ XSECXMLSEC_DLLPUBLIC void deInitXmlSec()
xmlDisableStreamInputCallbacks();
#ifdef XMLSEC_CRYPTO_MSCRYPTO
xmlSecMSCngShutdown();
-#else
+#endif
+#ifdef XMLSEC_CRYPTO_NSS
xmlSecNssShutdown();
#endif
xmlSecShutdown();