[cpp-xmltooling] branch master updated: Non-Windows fixes.

[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=bafe63b6807861dc76e4a4135ac8735367bd51e9

The following commit(s) were added to refs/heads/master by this push:
       new  bafe63b   Non-Windows fixes.
bafe63b is described below

commit bafe63b6807861dc76e4a4135ac8735367bd51e9
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Sun Mar 25 13:51:42 2018 -0400

    Non-Windows fixes.
---
 xmltooling/Makefile.am                             | 6 +++---
 xmltooling/security/impl/DataSealer.cpp            | 4 ++--
 xmltooling/security/impl/StaticPKIXTrustEngine.cpp | 2 --
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/xmltooling/Makefile.am b/xmltooling/Makefile.am
index fc5facd..27d54af 100644
--- a/xmltooling/Makefile.am
+++ b/xmltooling/Makefile.am
@@ -143,7 +143,7 @@ xmlsec_sources = \
 	security/impl/ChainingTrustEngine.cpp \
 	security/impl/CredentialCriteria.cpp \
 	security/impl/CredentialResolver.cpp \
-    security/impl/DataSealer.cpp \
+	security/impl/DataSealer.cpp \
 	security/impl/DummyCredentialResolver.cpp \
 	security/impl/ExplicitKeyTrustEngine.cpp \
 	security/impl/FilesystemCredentialResolver.cpp \
@@ -154,9 +154,10 @@ xmlsec_sources = \
 	security/impl/OpenSSLSecurityHelper.cpp \
 	security/impl/PKIXPathValidator.cpp \
 	security/impl/SecurityHelper.cpp \
-    security/impl/StaticDataSealerKeyStrategy.cpp \
+	security/impl/StaticDataSealerKeyStrategy.cpp \
 	security/impl/StaticPKIXTrustEngine.cpp \
 	security/impl/TrustEngine.cpp \
+	security/impl/VersionedDataSealerKeyStrategy.cpp \
 	security/impl/XSECCryptoX509CRL.cpp \
 	signature/impl/KeyInfoImpl.cpp \
 	signature/impl/KeyInfoSchemaValidators.cpp \
@@ -164,7 +165,6 @@ xmlsec_sources = \
 	signature/impl/XMLSecSignatureImpl.cpp \
 	soap/impl/CURLSOAPTransport.cpp \
 	util/CurlURLInputStream.cpp \
-    util/DataSealer.cpp \
 	util/ReplayCache.cpp \
 	util/StorageService.cpp
 
diff --git a/xmltooling/security/impl/DataSealer.cpp b/xmltooling/security/impl/DataSealer.cpp
index fa97145..b467a5f 100644
--- a/xmltooling/security/impl/DataSealer.cpp
+++ b/xmltooling/security/impl/DataSealer.cpp
@@ -115,7 +115,7 @@ string DataSealer::wrap(const char* s, time_t exp) const
     struct tm* ptime = gmtime(&exp);
 #else
     struct tm res;
-    struct tm* ptime = gmtime_r(exp, &res);
+    struct tm* ptime = gmtime_r(&exp, &res);
 #endif
     char timebuf[32];
     strftime(timebuf, 32, "%Y-%m-%dT%H:%M:%SZ", ptime);
@@ -257,7 +257,7 @@ string DataSealer::unwrap(const char* s) const
 		throw IOException("Unable to verify key used to decrypt data.");
 	string keyLabel = decrypted.substr(0, i);
 	if (keyLabel != requiredKey.first) {
-		m_log.warn("key mismatch, outside (%s), inside (%s)", requiredKey.first, keyLabel);
+		m_log.warn("key mismatch, outside (%s), inside (%s)", requiredKey.first.c_str(), keyLabel.c_str());
 		throw IOException("Embedded key label does not match key used to decrypt data.");
 	}
 
diff --git a/xmltooling/security/impl/StaticPKIXTrustEngine.cpp b/xmltooling/security/impl/StaticPKIXTrustEngine.cpp
index afa7575..0994ee6 100644
--- a/xmltooling/security/impl/StaticPKIXTrustEngine.cpp
+++ b/xmltooling/security/impl/StaticPKIXTrustEngine.cpp
@@ -45,8 +45,6 @@ namespace xmltooling {
     static const XMLCh _CredentialResolver[] =  UNICODE_LITERAL_18(C,r,e,d,e,n,t,i,a,l,R,e,s,o,l,v,e,r);
     static const XMLCh type[] =                 UNICODE_LITERAL_4(t,y,p,e);
     static const XMLCh certificate[] =          UNICODE_LITERAL_11(c,e,r,t,i,f,i,c,a,t,e);
-    static const XMLCh Certificate[] =          UNICODE_LITERAL_11(C,e,r,t,i,f,i,c,a,t,e);
-    static const XMLCh Path[] =                 UNICODE_LITERAL_4(P,a,t,h);
     static const XMLCh verifyDepth[] =          UNICODE_LITERAL_11(v,e,r,i,f,y,D,e,p,t,h);
 
     class XMLTOOL_DLLLOCAL StaticPKIXTrustEngine : public AbstractPKIXTrustEngine

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