diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2007-02-01 21:29:34 +0300 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2007-02-01 21:29:34 +0300 |
| commit | dcf1584c86c1f0a276ffc518e5307bdedfac5437 (patch) | |
| tree | 91891c6136cd87ed931c369793c15e08888ffd2a /mcs/class/System.Security/System.Security.Cryptography.Xml | |
| parent | 067f8f76e6ce2e25faff3dcc7c98d1dc5ff42320 (diff) | |
2007-02-01 Atsushi Enomoto <atsushi@ximian.com>
* SignedXml.cs : for internal URI (#blah) resolution, use
GetIdElement() so that any derived class which overrides this
method could resolve the reference correctly.
svn path=/trunk/mcs/; revision=72119
Diffstat (limited to 'mcs/class/System.Security/System.Security.Cryptography.Xml')
| -rw-r--r-- | mcs/class/System.Security/System.Security.Cryptography.Xml/ChangeLog | 6 | ||||
| -rw-r--r-- | mcs/class/System.Security/System.Security.Cryptography.Xml/SignedXml.cs | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/ChangeLog b/mcs/class/System.Security/System.Security.Cryptography.Xml/ChangeLog index ede1181f27f..eb44ae5004d 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Xml/ChangeLog +++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/ChangeLog @@ -1,3 +1,9 @@ +2007-02-01 Atsushi Enomoto <atsushi@ximian.com> + + * SignedXml.cs : for internal URI (#blah) resolution, use + GetIdElement() so that any derived class which overrides this + method could resolve the reference correctly. + 2007-01-25 Atsushi Enomoto <atsushi@ximian.com> * SignedXml.cs : for DataObject, copy namespaces in Data into Object diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/SignedXml.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/SignedXml.cs index 22cd24a0107..a8c70fe6f1d 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Xml/SignedXml.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/SignedXml.cs @@ -328,12 +328,9 @@ namespace System.Security.Cryptography.Xml { } } if (found == null && envdoc != null) { - foreach (XmlElement el in envdoc.SelectNodes ("//*[@Id]")) - if (el.GetAttribute ("Id") == objectName) { - found = el; - doc.LoadXml (found.OuterXml); - break; - } + found = GetIdElement (envdoc, objectName); + if (found != null) + doc.LoadXml (found.OuterXml); } if (found == null) throw new CryptographicException (String.Format ("Malformed reference object: {0}", objectName)); |