diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2007-01-22 21:27:02 +0300 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2007-01-22 21:27:02 +0300 |
| commit | db6d5d50c357c2a667d10d7d5eaba1e0deccc7c1 (patch) | |
| tree | de1e941d7d156d4ce8b08687ede20996acb24496 /mcs/class/System.Security | |
| parent | 7bce9d1c7d9ef6ef36f7fbd8a85b9b692af33459 (diff) | |
2007-01-22 Atsushi Enomoto <atsushi@ximian.com>
* XmlCanonicalizer.cs : Fixed incorect is-visibly-utilized check. Got
Phaos tests passed.
* SignedInfo.cs : removed incorrect CanonicalizationMethodObject
implementation.
* EncryptedReference.cs : added exc-c14n support in LoadXml().
svn path=/trunk/mcs/; revision=71452
Diffstat (limited to 'mcs/class/System.Security')
5 files changed, 20 insertions, 11 deletions
diff --git a/mcs/class/System.Security/Mono.Xml/ChangeLog b/mcs/class/System.Security/Mono.Xml/ChangeLog index 50d122a5297..2709e7178b9 100644 --- a/mcs/class/System.Security/Mono.Xml/ChangeLog +++ b/mcs/class/System.Security/Mono.Xml/ChangeLog @@ -1,3 +1,8 @@ +2007-01-22 Atsushi Enomoto <atsushi@ximian.com> + + * XmlCanonicalizer.cs : Fixed incorect is-visibly-utilized check. Got + Phaos tests passed. + 2007-01-17 Atsushi Enomoto <atsushi@ximian.com> * XmlCanonicalizer.cs : don't output default namespace when the node's diff --git a/mcs/class/System.Security/Mono.Xml/XmlCanonicalizer.cs b/mcs/class/System.Security/Mono.Xml/XmlCanonicalizer.cs index 9a8a4398f50..0ca433dd0c5 100644 --- a/mcs/class/System.Security/Mono.Xml/XmlCanonicalizer.cs +++ b/mcs/class/System.Security/Mono.Xml/XmlCanonicalizer.cs @@ -259,10 +259,8 @@ namespace Mono.Xml { // check that we have not rendered it yet bool rendered = IsNamespaceRendered (prefix, attribute.Value); - // For exc-c14n, only visually utilized + // For exc-c14n, only visibly utilized // namespaces are written. - if (exclusive && rendered) - continue; if (exclusive && !IsVisiblyUtilized (node as XmlElement, attribute)) continue; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/ChangeLog b/mcs/class/System.Security/System.Security.Cryptography.Xml/ChangeLog index 90bb41dc4d3..78fca9cdbf0 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-01-22 Atsushi Enomoto <atsushi@ximian.com> + + * SignedInfo.cs : removed incorrect CanonicalizationMethodObject + implementation. + * EncryptedReference.cs : added exc-c14n support in LoadXml(). + 2007-01-17 Atsushi Enomoto <atsushi@ximian.com> * XmlDsigExcC14NTransform.cs : diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedReference.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedReference.cs index 12fbb07e454..7044d9f6196 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedReference.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedReference.cs @@ -156,6 +156,12 @@ namespace System.Security.Cryptography.Xml { t = new XmlDsigXsltTransform (); break; #if NET_2_0 + case XmlSignature.AlgorithmNamespaces.XmlDsigExcC14NTransform: + t = new XmlDsigExcC14NTransform (); + break; + case XmlSignature.AlgorithmNamespaces.XmlDsigExcC14NWithCommentsTransform: + t = new XmlDsigExcC14NWithCommentsTransform (); + break; case XmlSignature.AlgorithmNamespaces.XmlDecryptionTransform: t = new XmlDecryptionTransform (); break; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/SignedInfo.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/SignedInfo.cs index 38496b8f092..a8bf1bde5e7 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Xml/SignedInfo.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/SignedInfo.cs @@ -44,17 +44,10 @@ namespace System.Security.Cryptography.Xml { private string signatureLength; private XmlElement element; -#if NET_2_0 - XmlDsigC14NTransform canonicalizationMethodObject; -#endif - public SignedInfo() { references = new ArrayList (); c14nMethod = "http://www.w3.org/TR/2001/REC-xml-c14n-20010315"; -#if NET_2_0 - canonicalizationMethodObject = new XmlDsigC14NTransform (); -#endif } public string CanonicalizationMethod { @@ -67,8 +60,9 @@ namespace System.Security.Cryptography.Xml { #if NET_2_0 [ComVisible (false)] + [MonoTODO] public Transform CanonicalizationMethodObject { - get { return canonicalizationMethodObject; } + get { throw new NotImplementedException (); } } #endif |