blautenb 2003/06/01 05:20:08
Modified: c/src/dsig DSIGTransformC14n.cpp
c/src/samples IOStreamOutputter.cpp
c/src/tools/templatesign templatesign.cpp
c/src/tools/xtest xtest.cpp
Log:
Bug in c14n code that was flushed out by Xerces 2.3 + minor changes to
support 2.3 better
Revision Changes Path
1.10 +2 -2 xml-security/c/src/dsig/DSIGTransformC14n.cpp
Index: DSIGTransformC14n.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGTransformC14n.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DSIGTransformC14n.cpp 1 May 2003 10:04:36 -0000 1.9
+++ DSIGTransformC14n.cpp 1 Jun 2003 12:20:08 -0000 1.10
@@ -315,7 +315,7 @@
// Create the transform node
makeQName(str, prefix, "InclusiveNamespaces");
- mp_inclNSNode =
doc->createElementNS(DSIGConstants::s_unicodeStrURIDSIG, str.rawXMLChBuffer());
+ mp_inclNSNode = doc->createElementNS(DSIGConstants::s_unicodeStrURIEC,
str.rawXMLChBuffer());
// Add the node to the owner element
mp_txfmNode->appendChild(doc->createTextNode(DSIGConstants::s_unicodeStrNL));
1.3 +5 -1 xml-security/c/src/samples/IOStreamOutputter.cpp
Index: IOStreamOutputter.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/samples/IOStreamOutputter.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IOStreamOutputter.cpp 9 Feb 2003 11:13:51 -0000 1.2
+++ IOStreamOutputter.cpp 1 Jun 2003 12:20:08 -0000 1.3
@@ -964,9 +964,13 @@
+#if defined(XSEC_XERCES_FORMATTER_REQUIRES_VERSION)
+ gFormatter = new XMLFormatter("UTF-8", 0, formatTarget,
+ XMLFormatter::NoEscapes,
gUnRepFlags);
+#else
gFormatter = new XMLFormatter("UTF-8", formatTarget,
XMLFormatter::NoEscapes,
gUnRepFlags);
-
+#endif
}
//
--------------------------------------------------------------------------------
1.8 +6 -1 xml-security/c/src/tools/templatesign/templatesign.cpp
Index: templatesign.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/tools/templatesign/templatesign.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- templatesign.cpp 23 Apr 2003 07:31:41 -0000 1.7
+++ templatesign.cpp 1 Jun 2003 12:20:08 -0000 1.8
@@ -1165,8 +1165,13 @@
+#if defined(XSEC_XERCES_FORMATTER_REQUIRES_VERSION)
+ gFormatter = new XMLFormatter("UTF-8", 0, formatTarget,
+ XMLFormatter::NoEscapes,
gUnRepFlags);
+#else
gFormatter = new XMLFormatter("UTF-8", formatTarget,
XMLFormatter::NoEscapes,
gUnRepFlags);
+#endif
cout << doc;
1.15 +5 -3 xml-security/c/src/tools/xtest/xtest.cpp
Index: xtest.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/tools/xtest/xtest.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xtest.cpp 31 May 2003 22:55:08 -0000 1.14
+++ xtest.cpp 1 Jun 2003 12:20:08 -0000 1.15
@@ -287,7 +287,7 @@
/* We output a version number to overcome a "feature" in Microsoft's
memory
leak detection */
- cout << "DSIG Info (Using Apache XML-Security-C Library v" <<
XSEC_VERSION_MAJOR <<
+ cerr << "DSIG Info (Using Apache XML-Security-C Library v" <<
XSEC_VERSION_MAJOR <<
"." << XSEC_VERSION_MEDIUM << "." << XSEC_VERSION_MINOR <<
")\n";
#if defined (_DEBUG) && defined (_MSC_VER)
@@ -563,7 +563,9 @@
char * mbuf = new char [len + 1];
memcpy(mbuf, formatTarget->getRawBuffer(), len);
mbuf[len] = '\0';
-
+#if 0
+ cout << mbuf << endl;
+#endif
delete theSerializer;
delete formatTarget;
