You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by sc...@apache.org on 2010/02/03 20:30:17 UTC
svn commit: r906195 - in /xml/security/trunk/c: CHANGELOG.txt
src/dsig/DSIGKeyInfoList.cpp
Author: scantor
Date: Wed Feb 3 19:30:16 2010
New Revision: 906195
URL: http://svn.apache.org/viewvc?rev=906195&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=48676
Modified:
xml/security/trunk/c/CHANGELOG.txt
xml/security/trunk/c/src/dsig/DSIGKeyInfoList.cpp
Modified: xml/security/trunk/c/CHANGELOG.txt
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/CHANGELOG.txt?rev=906195&r1=906194&r2=906195&view=diff
==============================================================================
--- xml/security/trunk/c/CHANGELOG.txt (original)
+++ xml/security/trunk/c/CHANGELOG.txt Wed Feb 3 19:30:16 2010
@@ -1,4 +1,8 @@
-Changes since 1.5
+Changes since 1.5.1
+=====================================
+* Fix for bug#48676 in RetrievalMethod handler (SC)
+
+Changes between 1.5 and 1.5.1
=====================================
* Fix for bug#47353 in c14n of default namespaces (SC)
* Fix Sparc compilation bug (SC)
Modified: xml/security/trunk/c/src/dsig/DSIGKeyInfoList.cpp
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/src/dsig/DSIGKeyInfoList.cpp?rev=906195&r1=906194&r2=906195&view=diff
==============================================================================
--- xml/security/trunk/c/src/dsig/DSIGKeyInfoList.cpp (original)
+++ xml/security/trunk/c/src/dsig/DSIGKeyInfoList.cpp Wed Feb 3 19:30:16 2010
@@ -290,13 +290,13 @@
Janitor<TXFMChain> j_chain(chain);
// Now check for transforms
- tmpKI = tmpKI->getFirstChild();
+ DOMNode * tmpTran = tmpKI->getFirstChild();
- while (tmpKI != 0 && (tmpKI->getNodeType() != DOMNode::ELEMENT_NODE))
+ while (tmpTran != 0 && (tmpTran->getNodeType() != DOMNode::ELEMENT_NODE))
// Skip text and comments
- tmpKI = tmpKI->getNextSibling();
+ tmpTran = tmpTran->getNextSibling();
- if (tmpKI != 0 && strEquals(getDSIGLocalName(tmpKI), "Transforms")) {
+ if (tmpTran != 0 && strEquals(getDSIGLocalName(tmpTran), "Transforms")) {
// Process the transforms using the static function.
@@ -304,7 +304,7 @@
// Just built the transform list, process it and then destroy it.
DSIGTransformList * l = DSIGReference::loadTransforms(
- tmpKI,
+ tmpTran,
mp_env->getSBFormatter(),
mp_env);
@@ -353,7 +353,7 @@
while (element != NULL) {
// Try to add each element - just call KeyInfoList add as it will
- // do the check to see if it is a valud KeyInfo
+ // do the check to see if it is a valid KeyInfo
addXMLKeyInfo((DOMNode *) element);
element = lst.getNextNode();