From b2eabc0c441733835663f9b667ee4d8706708535 Mon Sep 17 00:00:00 2001
From: Aleksey Sanin <aleksey@src.gnome.org>
Date: Fri, 28 Oct 2005 03:15:18 +0000
Subject: [PATCH] fixed bug in exc-c14n namespace visibility + test case
 319367(bug #319367)

---
 ChangeLog                                   |  6 ++++++
 c14n.c                                      |  2 +-
 result/c14n/exc-without-comments/test-2     | 11 +++++++++++
 test/c14n/exc-without-comments/test-2.xml   | 20 ++++++++++++++++++++
 test/c14n/exc-without-comments/test-2.xpath |  6 ++++++
 5 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 result/c14n/exc-without-comments/test-2
 create mode 100644 test/c14n/exc-without-comments/test-2.xml
 create mode 100644 test/c14n/exc-without-comments/test-2.xpath

diff --git a/ChangeLog b/ChangeLog
index a31f8c21..157a1981 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-27  Aleksey Sanin <aleksey@aleksey.com>
+	* c14n.c  result/c14n/exc-without-comments/test-2
+	  test/c14n/exc-without-comments/test-2.xml
+	  test/c14n/exc-without-comments/test-2.xpath: fixing
+	  bug in exc-c14n namespace visibility + test case (bug #319367)
+
 Thu Oct 27 16:10:31 CEST 2005 Daniel Veillard <daniel@veillard.com>
 
 	* python/libxml.py: remove warnings to stdout patch from Nic Ferrier
diff --git a/c14n.c b/c14n.c
index 32c70045..33a5803f 100644
--- a/c14n.c
+++ b/c14n.c
@@ -802,7 +802,7 @@ xmlExcC14NProcessNamespacesAxis(xmlC14NCtxPtr ctx, xmlNodePtr cur, int visible)
 	    if(xmlStrlen(attr->ns->prefix) == 0) {
 		has_empty_ns = 1;
 	    }
-	} else if(attr->ns == NULL) {
+	} else if((attr->ns != NULL) && (xmlStrlen(attr->ns->prefix) == 0) && (xmlStrlen(attr->ns->href) == 0)) {
 	    has_visibly_utilized_empty_ns = 1;
 	}
     }
diff --git a/result/c14n/exc-without-comments/test-2 b/result/c14n/exc-without-comments/test-2
new file mode 100644
index 00000000..0b8a0cb8
--- /dev/null
+++ b/result/c14n/exc-without-comments/test-2
@@ -0,0 +1,11 @@
+<SignedInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+    <ds:CanonicalizationMethod xmlns:ds="http://www.w3.org/2000/09/xmldsig#" Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"></ds:CanonicalizationMethod>
+    <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"></SignatureMethod>
+    <Reference URI="#ndid:1234-5678-0987">
+      <Transforms>
+        <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"></Transform>
+      </Transforms>
+      <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></DigestMethod>
+      <DigestValue>sj1VXDB2VMCU5qmva2OtDw3kKOs=</DigestValue>
+    </Reference>
+  </SignedInfo>
\ No newline at end of file
diff --git a/test/c14n/exc-without-comments/test-2.xml b/test/c14n/exc-without-comments/test-2.xml
new file mode 100644
index 00000000..83d15a78
--- /dev/null
+++ b/test/c14n/exc-without-comments/test-2.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
+  <SignedInfo>
+    <ds:CanonicalizationMethod xmlns:ds="http://www.w3.org/2000/09/xmldsig#" Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+    <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <Reference URI="#ndid:1234-5678-0987">
+      <Transforms>
+        <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+      </Transforms>
+      <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+      <DigestValue>sj1VXDB2VMCU5qmva2OtDw3kKOs=</DigestValue>
+    </Reference>
+  </SignedInfo>
+  <SignatureValue>...</SignatureValue>
+  <KeyInfo>
+    <X509Data>
+      <X509Certificate>...</X509Certificate>
+    </X509Data>
+  </KeyInfo>
+</Signature>
diff --git a/test/c14n/exc-without-comments/test-2.xpath b/test/c14n/exc-without-comments/test-2.xpath
new file mode 100644
index 00000000..e57652fd
--- /dev/null
+++ b/test/c14n/exc-without-comments/test-2.xpath
@@ -0,0 +1,6 @@
+<XPath xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+(//. | //@* | //namespace::*)
+[
+    ancestor-or-self::ds:SignedInfo
+] 
+</XPath>
\ No newline at end of file