Merge commit from fork

robrichards · web-flow · commit bc87389224c6 · 2025-12-08T06:57:53.000-05:00
* throw exception upon canonicalization error

* attribute change
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,5 +1,9 @@
 xmlseclibs.php
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+08, Dec 2025, 3.1.4
+Security:
+- fix canonicalization bypass error (d0ge)
+
 20, Nov 2024, 3.1.3
 Bug Fixes:
 - remove loadKey check due to BC issues
diff --git a/src/XMLSecurityDSig.php b/src/XMLSecurityDSig.php
@@ -293,7 +293,11 @@ private function canonicalizeData($node, $canonicalmethod, $arXPath=null, $prefi
             }
         }
 
-        return $node->C14N($exclusive, $withComments, $arXPath, $prefixList);
+        $ret = $node->C14N($exclusive, $withComments, $arXPath, $prefixList);
+        if ($ret === false) {
+            throw new Exception("Canonicalization failed");
+        }
+        return $ret; 
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,11 @@ private function canonicalizeData($node, $canonicalmethod, $arXPath=null, $prefi`
`293`	`293`	`}`
`294`	`294`	`}`
`295`	`295`
`296`		`- return $node->C14N($exclusive, $withComments, $arXPath, $prefixList);`
	`296`	`+ $ret = $node->C14N($exclusive, $withComments, $arXPath, $prefixList);`
	`297`	`+ if ($ret === false) {`
	`298`	`+ throw new Exception("Canonicalization failed");`
	`299`	`+ }`
	`300`	`+ return $ret;`
`297`	`301`	`}`
`298`	`302`
`299`	`303`	`/**`