Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'mcs/class/System.Security/System.Security.Cryptography.Xml')
-rw-r--r--mcs/class/System.Security/System.Security.Cryptography.Xml/ChangeLog5
-rw-r--r--mcs/class/System.Security/System.Security.Cryptography.Xml/Signature.cs5
2 files changed, 8 insertions, 2 deletions
diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/ChangeLog b/mcs/class/System.Security/System.Security.Cryptography.Xml/ChangeLog
index a0b692b21d0..4fbb13a002a 100644
--- a/mcs/class/System.Security/System.Security.Cryptography.Xml/ChangeLog
+++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-20 Atsushi Enomoto <atsushi@ximian.com>
+
+ * Signature.cs : Fixed NextElementPos() that incorrectly examined
+ node matching.
+
2004-06-17 Sebastien Pouliot <sebastien@ximian.com>
* KeyInfoX509Data.cs: Removed old internal IssuerSerial for the
diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/Signature.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/Signature.cs
index 72e5088ed38..9aab99f8386 100644
--- a/mcs/class/System.Security/System.Security.Cryptography.Xml/Signature.cs
+++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/Signature.cs
@@ -192,13 +192,14 @@ namespace System.Security.Cryptography.Xml {
{
while (pos < nl.Count) {
if (nl [pos].NodeType == XmlNodeType.Element) {
- if (nl [pos].LocalName != name && nl [pos].NamespaceURI != ns) {
+ if (nl [pos].LocalName != name || nl [pos].NamespaceURI != ns) {
if (required)
throw new CryptographicException ("Malformed element " + name);
else
return -2;
}
- return pos;
+ else
+ return pos;
}
else
pos++;