[cpp-xmltooling] branch master updated: Fix Linux errors.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository cpp-xmltooling.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-xmltooling.git;a=commit;h=38a627f39b9a1fcfca586bb10606019ec09e8560

The following commit(s) were added to refs/heads/master by this push:
       new  38a627f   Fix Linux errors.
38a627f is described below

commit 38a627f39b9a1fcfca586bb10606019ec09e8560
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue May 1 22:38:38 2018 -0400

    Fix Linux errors.
---
 xmltooling.spec.in                      | 2 +-
 xmltooling/security/impl/DataSealer.cpp | 2 +-
 xmltoolingtest/SignatureTest.h          | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/xmltooling.spec.in b/xmltooling.spec.in
index 25518d8..742a335 100644
--- a/xmltooling.spec.in
+++ b/xmltooling.spec.in
@@ -12,7 +12,7 @@ BuildRequires:  libxerces-c-devel >= 3.2
 BuildRequires:  libxml-security-c-devel >= 2.0.0
 %{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0}
 %{!?_with_log4cpp:BuildRequires: liblog4shib-devel >= 1.0.4}
-BuildRequires: gcc-c++, openssl-devel, boost-devel >= 1.32.0
+BuildRequires: gcc-c++, zlib-devel, openssl-devel, boost-devel >= 1.32.0
 %if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600 || 0%{?amzn} >= 1
 BuildRequires: libcurl-openssl-devel >= 7.21.7
 Requires: libcurl-openssl >= 7.21.7
diff --git a/xmltooling/security/impl/DataSealer.cpp b/xmltooling/security/impl/DataSealer.cpp
index 6002866..17eef55 100644
--- a/xmltooling/security/impl/DataSealer.cpp
+++ b/xmltooling/security/impl/DataSealer.cpp
@@ -183,7 +183,7 @@ string DataSealer::unwrap(const char* s) const
 	// KEYLABEL and a colon on the outside, as a key hint.
 
 	// First extract the key label up to the first colon.
-	pair<string, const XSECCryptoSymmetricKey*> requiredKey = make_pair(string(), nullptr);
+	pair<string, const XSECCryptoSymmetricKey*> requiredKey = make_pair<string, const XSECCryptoSymmetricKey*>(string(), nullptr);
 	const char* delim = strchr(s ? s : "", ':');
 	if (delim && delim > s) {
 		requiredKey.first.append(s, delim - s);
diff --git a/xmltoolingtest/SignatureTest.h b/xmltoolingtest/SignatureTest.h
index 46841e5..99c802d 100644
--- a/xmltoolingtest/SignatureTest.h
+++ b/xmltoolingtest/SignatureTest.h
@@ -31,6 +31,9 @@
 #include <xercesc/util/XMLUniDefs.hpp>
 #include <xsec/dsig/DSIGReference.hpp>
 #include <xsec/dsig/DSIGSignature.hpp>
+#include <xsec/enc/XSECCryptoKeyDSA.hpp>
+#include <xsec/enc/XSECCryptoKeyEC.hpp>
+#include <xsec/enc/XSECCryptoKeyRSA.hpp>
 #include <openssl/opensslv.h>
 
 class TestContext : public ContentReference

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.