From 56ab90d4e9fde3be3a34947e4a48937326566fb3 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 3 Feb 2020 16:22:38 +0100 Subject: Provide more details on failure to load xmlsec-crypto. --- src/util.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/util.cc') diff --git a/src/util.cc b/src/util.cc index 9374b6e7..c79b8160 100644 --- a/src/util.cc +++ b/src/util.cc @@ -176,7 +176,7 @@ dcp::init () #ifdef XMLSEC_CRYPTO_DYNAMIC_LOADING if (xmlSecCryptoDLLoadLibrary(BAD_CAST XMLSEC_CRYPTO) < 0) { - throw MiscError ("unable to load default xmlsec-crypto library"); + throw MiscError (String::compose("unable to load default xmlsec-crypto library '%1'", XMLSEC_CRYPTO)); } #endif -- cgit v1.2.3 From ada2065df461ae9e56165e93e02b901c67a8bea3 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 3 Feb 2020 16:43:01 +0100 Subject: Try to fix build of previous. --- src/util.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/util.cc') diff --git a/src/util.cc b/src/util.cc index c79b8160..66a03194 100644 --- a/src/util.cc +++ b/src/util.cc @@ -176,7 +176,7 @@ dcp::init () #ifdef XMLSEC_CRYPTO_DYNAMIC_LOADING if (xmlSecCryptoDLLoadLibrary(BAD_CAST XMLSEC_CRYPTO) < 0) { - throw MiscError (String::compose("unable to load default xmlsec-crypto library '%1'", XMLSEC_CRYPTO)); + throw MiscError (String::compose("unable to load default xmlsec-crypto library '%1'", string(XMLSEC_CRYPTO))); } #endif -- cgit v1.2.3 From 718d47c3900ab152272d68a29588bd689141071e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 3 Feb 2020 16:51:49 +0100 Subject: Try again to fix Windows build of previous. --- src/util.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/util.cc') diff --git a/src/util.cc b/src/util.cc index 66a03194..fba54cd3 100644 --- a/src/util.cc +++ b/src/util.cc @@ -176,7 +176,7 @@ dcp::init () #ifdef XMLSEC_CRYPTO_DYNAMIC_LOADING if (xmlSecCryptoDLLoadLibrary(BAD_CAST XMLSEC_CRYPTO) < 0) { - throw MiscError (String::compose("unable to load default xmlsec-crypto library '%1'", string(XMLSEC_CRYPTO))); + throw MiscError (String::compose("unable to load default xmlsec-crypto library '%1'", reinterpret_cast((XMLSEC_CRYPTO)))); } #endif -- cgit v1.2.3 From 8331c050aab2e53ff7848c354e6790c681600dee Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 3 Feb 2020 17:08:17 +0100 Subject: Try always loading the openssl crypto module, not the default one. --- src/util.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/util.cc') diff --git a/src/util.cc b/src/util.cc index fba54cd3..ba9e6fa2 100644 --- a/src/util.cc +++ b/src/util.cc @@ -175,8 +175,8 @@ dcp::init () } #ifdef XMLSEC_CRYPTO_DYNAMIC_LOADING - if (xmlSecCryptoDLLoadLibrary(BAD_CAST XMLSEC_CRYPTO) < 0) { - throw MiscError (String::compose("unable to load default xmlsec-crypto library '%1'", reinterpret_cast((XMLSEC_CRYPTO)))); + if (xmlSecCryptoDLLoadLibrary(BAD_CAST "openssl") < 0) { + throw MiscError (String::compose("unable to load openssl xmlsec-crypto library")); } #endif -- cgit v1.2.3 From 43c859fa095987d3c367c2426f698d7477e81305 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 3 Feb 2020 17:15:49 +0100 Subject: Another build fix. --- src/util.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/util.cc') diff --git a/src/util.cc b/src/util.cc index ba9e6fa2..f755c21e 100644 --- a/src/util.cc +++ b/src/util.cc @@ -176,7 +176,7 @@ dcp::init () #ifdef XMLSEC_CRYPTO_DYNAMIC_LOADING if (xmlSecCryptoDLLoadLibrary(BAD_CAST "openssl") < 0) { - throw MiscError (String::compose("unable to load openssl xmlsec-crypto library")); + throw MiscError ("unable to load openssl xmlsec-crypto library"); } #endif -- cgit v1.2.3