From 68ad80745115ce5646ac4a6477e9a937ee339987 Mon Sep 17 00:00:00 2001
From: Scott Cantor <cantor.2@osu.edu>
Date: Mon, 4 Sep 2006 23:30:47 +0000
Subject: [PATCH] Migrate to xmlsec 1.3 release, shrink a few headers.

---
 xmltooling/signature/KeyResolver.h                | 3 ++-
 xmltooling/signature/Signature.h                  | 3 ++-
 xmltooling/signature/impl/InlineKeyResolver.cpp   | 3 ++-
 xmltooling/signature/impl/XMLSecSignatureImpl.cpp | 8 ++++----
 xmltoolingtest/InlineKeyResolverTest.h            | 1 +
 xmltoolingtest/SignatureTest.h                    | 1 +
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/xmltooling/signature/KeyResolver.h b/xmltooling/signature/KeyResolver.h
index 424382c..9270b1f 100644
--- a/xmltooling/signature/KeyResolver.h
+++ b/xmltooling/signature/KeyResolver.h
@@ -25,15 +25,16 @@
 #define __xmltooling_keyres_h__
 
 #include <xmltooling/security/XSECCryptoX509CRL.h>
-#include <xmltooling/signature/KeyInfo.h>
 
 #include <xsec/dsig/DSIGKeyInfoList.hpp>
 #include <xsec/enc/XSECCryptoKey.hpp>
 #include <xsec/enc/XSECCryptoX509.hpp>
 
+#include <algorithm>
 #include <vector>
 
 namespace xmlsignature {
+    class XMLTOOL_API KeyInfo;
     class XMLTOOL_API Signature;
 
     /**
diff --git a/xmltooling/signature/Signature.h b/xmltooling/signature/Signature.h
index 5afd95f..6ccc49c 100644
--- a/xmltooling/signature/Signature.h
+++ b/xmltooling/signature/Signature.h
@@ -25,7 +25,6 @@
 
 #include <xmltooling/exceptions.h>
 #include <xmltooling/XMLObjectBuilder.h>
-#include <xmltooling/signature/KeyInfo.h>
 #include <xmltooling/signature/ContentReference.h>
 #include <xmltooling/util/XMLConstants.h>
 
@@ -37,6 +36,8 @@
  */
 namespace xmlsignature {
 
+    class XMLTOOL_API KeyInfo;
+
     /**
      * XMLObject representing XML Digital Signature, version 20020212, Signature element.
      * The default signature settings include Exclusive c14n w/o comments, SHA-1 digests,
diff --git a/xmltooling/signature/impl/InlineKeyResolver.cpp b/xmltooling/signature/impl/InlineKeyResolver.cpp
index 5fb2d61..5e8eff3 100644
--- a/xmltooling/signature/impl/InlineKeyResolver.cpp
+++ b/xmltooling/signature/impl/InlineKeyResolver.cpp
@@ -22,10 +22,11 @@
 
 #include "internal.h"
 #include "signature/CachingKeyResolver.h"
+#include "signature/KeyInfo.h"
 #include "util/NDC.h"
 #include "util/Threads.h"
+#include "util/XMLConstants.h"
 
-#include <algorithm>
 #include <log4cpp/Category.hh>
 #include <xercesc/util/XMLUniDefs.hpp>
 #include <xsec/dsig/DSIGKeyInfoX509.hpp>
diff --git a/xmltooling/signature/impl/XMLSecSignatureImpl.cpp b/xmltooling/signature/impl/XMLSecSignatureImpl.cpp
index dfda1a4..31f5743 100644
--- a/xmltooling/signature/impl/XMLSecSignatureImpl.cpp
+++ b/xmltooling/signature/impl/XMLSecSignatureImpl.cpp
@@ -23,6 +23,7 @@
 #include "internal.h"
 #include "exceptions.h"
 #include "impl/UnknownElement.h"
+#include "signature/KeyInfo.h"
 #include "signature/Signature.h"
 #include "util/NDC.h"
 #include "util/XMLConstants.h"
@@ -177,10 +178,9 @@ void XMLSecSignatureImpl::sign()
 
     try {
         log.debug("creating signature reference(s)");
-        // TODO: Need XML-Sec fixed to clear references.
-        //DSIGReferenceList* refs = m_signature->getReferenceList();
-        //while (refs && refs->getSize())
-        //    delete refs->removeReference(0);
+        DSIGReferenceList* refs = m_signature->getReferenceList();
+        while (refs && refs->getSize())
+            delete refs->removeReference(0);
         m_reference->createReferences(m_signature);
         
         log.debug("computing signature");
diff --git a/xmltoolingtest/InlineKeyResolverTest.h b/xmltoolingtest/InlineKeyResolverTest.h
index 9cfbcde..0a23779 100644
--- a/xmltoolingtest/InlineKeyResolverTest.h
+++ b/xmltoolingtest/InlineKeyResolverTest.h
@@ -17,6 +17,7 @@
 #include "XMLObjectBaseTestCase.h"
 
 #include <fstream>
+#include <xmltooling/signature/KeyInfo.h>
 #include <xmltooling/signature/KeyResolver.h>
 
 using namespace xmlsignature;
diff --git a/xmltoolingtest/SignatureTest.h b/xmltoolingtest/SignatureTest.h
index 67e4ca4..c1ca7ec 100644
--- a/xmltoolingtest/SignatureTest.h
+++ b/xmltoolingtest/SignatureTest.h
@@ -17,6 +17,7 @@
 #include "XMLObjectBaseTestCase.h"
 
 #include <xmltooling/signature/CredentialResolver.h>
+#include <xmltooling/signature/KeyInfo.h>
 #include <xmltooling/signature/SignatureValidator.h>
 
 #include <fstream>
-- 
2.1.4