Migrate to xmlsec 1.3 release, shrink a few headers.

diff --git a/xmltooling/signature/KeyResolver.h b/xmltooling/signature/KeyResolver.h
index 424382c..9270b1f 100644 (file)
--- a/xmltooling/signature/KeyResolver.h
+++ b/xmltooling/signature/KeyResolver.h
@@ -25,15 +25,16 @@
 #define __xmltooling_keyres_h__\r
 \r
 #include <xmltooling/security/XSECCryptoX509CRL.h>\r
-#include <xmltooling/signature/KeyInfo.h>\r
 \r
 #include <xsec/dsig/DSIGKeyInfoList.hpp>\r
 #include <xsec/enc/XSECCryptoKey.hpp>\r
 #include <xsec/enc/XSECCryptoX509.hpp>\r
 \r
+#include <algorithm>\r
 #include <vector>\r
 \r
 namespace xmlsignature {\r
+    class XMLTOOL_API KeyInfo;\r
     class XMLTOOL_API Signature;\r
 \r
     /**\r

diff --git a/xmltooling/signature/Signature.h b/xmltooling/signature/Signature.h
index 5afd95f..6ccc49c 100644 (file)
--- a/xmltooling/signature/Signature.h
+++ b/xmltooling/signature/Signature.h
@@ -25,7 +25,6 @@
 \r
 #include <xmltooling/exceptions.h>\r
 #include <xmltooling/XMLObjectBuilder.h>\r
-#include <xmltooling/signature/KeyInfo.h>\r
 #include <xmltooling/signature/ContentReference.h>\r
 #include <xmltooling/util/XMLConstants.h>\r
 \r
@@ -37,6 +36,8 @@
  */\r
 namespace xmlsignature {\r
 \r
+    class XMLTOOL_API KeyInfo;\r
+\r
     /**\r
      * XMLObject representing XML Digital Signature, version 20020212, Signature element.\r
      * The default signature settings include Exclusive c14n w/o comments, SHA-1 digests,\r

diff --git a/xmltooling/signature/impl/InlineKeyResolver.cpp b/xmltooling/signature/impl/InlineKeyResolver.cpp
index 5fb2d61..5e8eff3 100644 (file)
--- a/xmltooling/signature/impl/InlineKeyResolver.cpp
+++ b/xmltooling/signature/impl/InlineKeyResolver.cpp
@@ -22,10 +22,11 @@
 \r
 #include "internal.h"\r
 #include "signature/CachingKeyResolver.h"\r
+#include "signature/KeyInfo.h"\r
 #include "util/NDC.h"\r
 #include "util/Threads.h"\r
+#include "util/XMLConstants.h"\r
 \r
-#include <algorithm>\r
 #include <log4cpp/Category.hh>\r
 #include <xercesc/util/XMLUniDefs.hpp>\r
 #include <xsec/dsig/DSIGKeyInfoX509.hpp>\r

diff --git a/xmltooling/signature/impl/XMLSecSignatureImpl.cpp b/xmltooling/signature/impl/XMLSecSignatureImpl.cpp
index dfda1a4..31f5743 100644 (file)
--- a/xmltooling/signature/impl/XMLSecSignatureImpl.cpp
+++ b/xmltooling/signature/impl/XMLSecSignatureImpl.cpp
@@ -23,6 +23,7 @@
 #include "internal.h"\r
 #include "exceptions.h"\r
 #include "impl/UnknownElement.h"\r
+#include "signature/KeyInfo.h"\r
 #include "signature/Signature.h"\r
 #include "util/NDC.h"\r
 #include "util/XMLConstants.h"\r
@@ -177,10 +178,9 @@ void XMLSecSignatureImpl::sign()
 \r
     try {\r
         log.debug("creating signature reference(s)");\r
-        // TODO: Need XML-Sec fixed to clear references.\r
-        //DSIGReferenceList* refs = m_signature->getReferenceList();\r
-        //while (refs && refs->getSize())\r
-        //    delete refs->removeReference(0);\r
+        DSIGReferenceList* refs = m_signature->getReferenceList();\r
+        while (refs && refs->getSize())\r
+            delete refs->removeReference(0);\r
         m_reference->createReferences(m_signature);\r
         \r
         log.debug("computing signature");\r

diff --git a/xmltoolingtest/InlineKeyResolverTest.h b/xmltoolingtest/InlineKeyResolverTest.h
index 9cfbcde..0a23779 100644 (file)
--- a/xmltoolingtest/InlineKeyResolverTest.h
+++ b/xmltoolingtest/InlineKeyResolverTest.h
@@ -17,6 +17,7 @@
 #include "XMLObjectBaseTestCase.h"\r
 \r
 #include <fstream>\r
+#include <xmltooling/signature/KeyInfo.h>\r
 #include <xmltooling/signature/KeyResolver.h>\r
 \r
 using namespace xmlsignature;\r

diff --git a/xmltoolingtest/SignatureTest.h b/xmltoolingtest/SignatureTest.h
index 67e4ca4..c1ca7ec 100644 (file)
--- a/xmltoolingtest/SignatureTest.h
+++ b/xmltoolingtest/SignatureTest.h
@@ -17,6 +17,7 @@
 #include "XMLObjectBaseTestCase.h"\r
 \r
 #include <xmltooling/signature/CredentialResolver.h>\r
+#include <xmltooling/signature/KeyInfo.h>\r
 #include <xmltooling/signature/SignatureValidator.h>\r
 \r
 #include <fstream>\r