From d7fb430b288ac77d653d6d1f12bd1ba89b56889d Mon Sep 17 00:00:00 2001
From: Scott Cantor <cantor.2@osu.edu>
Date: Mon, 6 May 2013 01:28:52 +0000
Subject: [PATCH] https://issues.shibboleth.net/jira/browse/CPPXT-94

---
 config_win32.h                                            | 6 +++---
 configure.ac                                              | 2 +-
 msbuild/Versions.props                                    | 2 +-
 xmltooling/Makefile.am                                    | 4 ++--
 xmltooling/security/impl/FilesystemCredentialResolver.cpp | 3 +++
 xmltooling/version.h                                      | 2 +-
 xmltooling/xmltooling.rc                                  | 8 ++++----
 7 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/config_win32.h b/config_win32.h
index 392d935..8de1ddf 100644
--- a/config_win32.h
+++ b/config_win32.h
@@ -114,13 +114,13 @@
 #define PACKAGE_NAME "xmltooling"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xmltooling 1.5.2"
+#define PACKAGE_STRING "xmltooling 1.5.3"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "xmltooling"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.5.2"
+#define PACKAGE_VERSION "1.5.3"
 
 /* Define to the necessary symbol if this constant uses a non-standard name on
    your system. */
@@ -133,7 +133,7 @@
 /* #undef TM_IN_SYS_TIME */
 
 /* Version number of package */
-#define VERSION "1.5.2"
+#define VERSION "1.5.3"
 
 /* Define if you wish to disable XML-Security-dependent features. */
 /* #undef XMLTOOLING_NO_XMLSEC */
diff --git a/configure.ac b/configure.ac
index 9fdabe1..4355b1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # Process this file with autoreconf
 AC_PREREQ([2.50])
-AC_INIT([xmltooling],[1.5.2],[https://issues.shibboleth.net/],[xmltooling])
+AC_INIT([xmltooling],[1.5.3],[https://issues.shibboleth.net/],[xmltooling])
 AC_CONFIG_SRCDIR(xmltooling)
 AC_CONFIG_AUX_DIR(build-aux)
 AC_CONFIG_MACRO_DIR(m4)
diff --git a/msbuild/Versions.props b/msbuild/Versions.props
index c58477b..5857a3e 100644
--- a/msbuild/Versions.props
+++ b/msbuild/Versions.props
@@ -33,7 +33,7 @@
     <SamlComponent64>{9EE0A8D1-A6DC-4E2A-904F-BBEF70A0D67B}</SamlComponent64>
     <SamlComponent64d>{00836378-7FB9-4A09-AF49-3AA33DEF9BC6}</SamlComponent64d>
 
-    <XmlToolingVersion>1.5.2</XmlToolingVersion>
+    <XmlToolingVersion>1.5.3</XmlToolingVersion>
     <XmlToolingFileVersion>1_5</XmlToolingFileVersion>
     <!-- Change the 8 components below if the XmlToolingFileVersion name changes -->
     <XMLToolingComponent32>{53533A59-A563-439D-B13D-A4D7090C42D3}</XMLToolingComponent32>
diff --git a/xmltooling/Makefile.am b/xmltooling/Makefile.am
index 0c4fd69..2389c05 100644
--- a/xmltooling/Makefile.am
+++ b/xmltooling/Makefile.am
@@ -204,13 +204,13 @@ common_sources = \
 libxmltooling_lite_la_SOURCES = \
 	${common_sources}
 libxmltooling_lite_la_CPPFLAGS = -DXMLTOOLING_LITE
-libxmltooling_lite_la_LDFLAGS = -version-info 6:2:0
+libxmltooling_lite_la_LDFLAGS = -version-info 6:3:0
 
 if BUILD_XMLSEC
 libxmltooling_la_SOURCES = \
 	${common_sources} \
 	${xmlsec_sources}
-libxmltooling_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 6:2:0
+libxmltooling_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 6:3:0
 endif
 
 install-exec-hook:
diff --git a/xmltooling/security/impl/FilesystemCredentialResolver.cpp b/xmltooling/security/impl/FilesystemCredentialResolver.cpp
index 2a4d630..480ef3b 100644
--- a/xmltooling/security/impl/FilesystemCredentialResolver.cpp
+++ b/xmltooling/security/impl/FilesystemCredentialResolver.cpp
@@ -516,6 +516,9 @@ FilesystemCredentialResolver::FilesystemCredentialResolver(const DOMElement* e)
     auto_ptr<Credential> credential(getCredential());
     m_lock = RWLock::create();
     m_credential = credential.release();
+    if (m_credential->getPrivateKey() == nullptr) {
+        log.info("no private key resolved, usable for verification/trust only");
+    }
 }
 
 FilesystemCredentialResolver::~FilesystemCredentialResolver()
diff --git a/xmltooling/version.h b/xmltooling/version.h
index e5f8182..819ba1b 100644
--- a/xmltooling/version.h
+++ b/xmltooling/version.h
@@ -44,7 +44,7 @@
 
 #define XMLTOOLING_VERSION_MAJOR 1
 #define XMLTOOLING_VERSION_MINOR 5
-#define XMLTOOLING_VERSION_REVISION 2
+#define XMLTOOLING_VERSION_REVISION 3
 
 /** DO NOT MODIFY BELOW THIS LINE */
 
diff --git a/xmltooling/xmltooling.rc b/xmltooling/xmltooling.rc
index 47b5b4b..6e327f9 100644
--- a/xmltooling/xmltooling.rc
+++ b/xmltooling/xmltooling.rc
@@ -51,7 +51,7 @@ BEGIN
 #else
             VALUE "FileDescription", "OpenSAML XMLTooling Library\0"
 #endif
-            VALUE "FileVersion", "1, 5, 2, 0\0"
+            VALUE "FileVersion", "1, 5, 3, 0\0"
 #ifdef XMLTOOLING_LITE
 #ifdef _DEBUG
             VALUE "InternalName", "xmltooling-lite1_5D\0"
@@ -65,7 +65,7 @@ BEGIN
             VALUE "InternalName", "xmltooling1_5\0"
 #endif
 #endif
-            VALUE "LegalCopyright", "Copyright © 2012 UCAID\0"
+            VALUE "LegalCopyright", "Copyright © 2013 UCAID\0"
             VALUE "LegalTrademarks", "\0"
 #ifdef XMLTOOLING_LITE
 #ifdef _DEBUG
@@ -81,8 +81,8 @@ BEGIN
 #endif
 #endif
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "OpenSAML 2.5.1\0"
-            VALUE "ProductVersion", "2, 5, 1, 0\0"
+            VALUE "ProductName", "OpenSAML 2.5.3\0"
+            VALUE "ProductVersion", "2, 5, 3, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END
-- 
2.1.4