Author: spouliot
Date: 2005-04-24 12:16:23 -0400 (Sun, 24 Apr 2005)
New Revision: 43514
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/ChangeLog
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/DataObject.cs
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedData.cs
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedKey.cs
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedType.cs
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedXml.cs
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptionProperties.cs
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/KeyInfoRetrievalMethod.cs
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/KeyInfoX509Data.cs
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/Reference.cs
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/ReferenceList.cs
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/SignedInfo.cs
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/SignedXml.cs
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/Transform.cs
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/X509IssuerSerial.cs
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlDsigC14NTransform.cs
Log:
2005-04-24 Sebastien Pouliot <[EMAIL PROTECTED]>
* SignedInfo.cs: Added [ComVisible (false)] to new property.
* SignedXml.cs: Added [ComVisible (false)] to new properties and
methods.
* ReferenceList.cs: Fixed members signatures for beta2.
* Reference.cs: Added [ComVisible (false)] to new set_TransformChain.
* EncryptedType.cs: Fix compilation with EncryptionPropertyCollection
changes.
* DataObject.cs: Fix compilation warnings.
* EncryptedKey.cs: Fix compilation with ReferenceList and
EncryptionPropertyCollection changes.
* EncryptionProperties.cs: Class has been renamed to
EncryptionPropertyCollection.
* Transform.cs: Added [ComVisible (false)] to new properties and
methods.
* EncryptedXml.cs: Changed XmlEncRSA1_5Url to XmlEncRSA15Url.
* KeyInfoRetrievalMethod.cs: Added [ComVisible (false)] to Type
property.
* KeyInfoX509Data.cs: Added [ComVisible (false)] to AddSubjectKeyId
(string) method and implemented it.
* EncryptedData.cs: Changed EncryptionProperties to new
EncryptionPropertyCollection.
* XmlDsigC14NTransform.cs: Added [ComVisible (false)] to
GetDigestedOutput method and added a basic implementation.
* X509IssuerSerial.cs: IssuerName and SerialNumber are now properties.
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/ChangeLog
===================================================================
--- trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/ChangeLog
2005-04-24 15:42:31 UTC (rev 43513)
+++ trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/ChangeLog
2005-04-24 16:16:23 UTC (rev 43514)
@@ -1,3 +1,30 @@
+2005-04-24 Sebastien Pouliot <[EMAIL PROTECTED]>
+
+ * SignedInfo.cs: Added [ComVisible (false)] to new property.
+ * SignedXml.cs: Added [ComVisible (false)] to new properties and
+ methods.
+ * ReferenceList.cs: Fixed members signatures for beta2.
+ * Reference.cs: Added [ComVisible (false)] to new set_TransformChain.
+ * EncryptedType.cs: Fix compilation with EncryptionPropertyCollection
+ changes.
+ * DataObject.cs: Fix compilation warnings.
+ * EncryptedKey.cs: Fix compilation with ReferenceList and
+ EncryptionPropertyCollection changes.
+ * EncryptionProperties.cs: Class has been renamed to
+ EncryptionPropertyCollection.
+ * Transform.cs: Added [ComVisible (false)] to new properties and
+ methods.
+ * EncryptedXml.cs: Changed XmlEncRSA1_5Url to XmlEncRSA15Url.
+ * KeyInfoRetrievalMethod.cs: Added [ComVisible (false)] to Type
+ property.
+ * KeyInfoX509Data.cs: Added [ComVisible (false)] to AddSubjectKeyId
+ (string) method and implemented it.
+ * EncryptedData.cs: Changed EncryptionProperties to new
+ EncryptionPropertyCollection.
+ * XmlDsigC14NTransform.cs: Added [ComVisible (false)] to
+ GetDigestedOutput method and added a basic implementation.
+ * X509IssuerSerial.cs: IssuerName and SerialNumber are now properties.
+
2005-04-23 Sebastien Pouliot <[EMAIL PROTECTED]>
* EncryptedXml.cs, SignedXml.cs: Changed X509CertificateEx to
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/DataObject.cs
===================================================================
---
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/DataObject.cs
2005-04-24 15:42:31 UTC (rev 43513)
+++
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/DataObject.cs
2005-04-24 16:16:23 UTC (rev 43514)
@@ -3,14 +3,12 @@
// http://www.w3.org/2000/09/xmldsig#Object
//
// Author:
-// Sebastien Pouliot ([EMAIL PROTECTED])
+// Sebastien Pouliot <[EMAIL PROTECTED]>
// Atsushi Enomoto ([EMAIL PROTECTED])
//
// (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
-// (C) 2004 Novell Inc.
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
//
-
-//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
@@ -40,9 +38,6 @@
// required for "enveloping signatures"
public class DataObject {
- private string id;
- private string mimeType;
- private string encoding;
private XmlElement element;
private bool propertyModified;
@@ -65,15 +60,12 @@
XmlDocument document = new XmlDocument ();
XmlElement xel = document.CreateElement
(XmlSignature.ElementNames.Object, XmlSignature.NamespaceURI);
if (id != null) {
- this.id = id;
xel.SetAttribute
(XmlSignature.AttributeNames.Id, id);
}
if (mimeType != null) {
- this.mimeType = mimeType;
xel.SetAttribute
(XmlSignature.AttributeNames.MimeType, mimeType);
}
if (encoding != null) {
- this.encoding = encoding;
xel.SetAttribute
(XmlSignature.AttributeNames.Encoding, encoding);
}
if (data != null) {
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedData.cs
===================================================================
---
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedData.cs
2005-04-24 15:42:31 UTC (rev 43513)
+++
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedData.cs
2005-04-24 16:16:23 UTC (rev 43514)
@@ -96,7 +96,7 @@
KeyInfo keyInfo = null;
CipherData cipherData = null;
EncryptionMethod = null;
- EncryptionProperties = new EncryptionProperties
();
+ EncryptionProperties = new
EncryptionPropertyCollection ();
Id = null;
Type = null;
MimeType = null;
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedKey.cs
===================================================================
---
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedKey.cs
2005-04-24 15:42:31 UTC (rev 43513)
+++
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedKey.cs
2005-04-24 16:16:23 UTC (rev 43514)
@@ -46,11 +46,8 @@
#region Constructors
public EncryptedKey ()
- : base ()
{
- CarriedKeyName = null;
- Recipient = null;
- ReferenceList = new ReferenceList ();
+ referenceList = new ReferenceList ();
}
#endregion // Constructors
@@ -69,7 +66,6 @@
public ReferenceList ReferenceList {
get { return referenceList; }
- set { referenceList = value; }
}
#endregion // Properties
@@ -150,8 +146,8 @@
KeyInfo keyInfo = null;
CipherData cipherData = null;
EncryptionMethod = null;
- EncryptionProperties = new EncryptionProperties
();
- ReferenceList = new ReferenceList ();
+ EncryptionProperties.Clear ();
+ ReferenceList.Clear ();
CarriedKeyName = null;
Id = null;
Type = null;
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedType.cs
===================================================================
---
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedType.cs
2005-04-24 15:42:31 UTC (rev 43513)
+++
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedType.cs
2005-04-24 16:16:23 UTC (rev 43514)
@@ -40,7 +40,7 @@
CipherData cipherData;
string encoding;
EncryptionMethod encryptionMethod;
- EncryptionProperties encryptionProperties;
+ EncryptionPropertyCollection encryptionProperties;
string id;
KeyInfo keyInfo;
string mimeType;
@@ -55,7 +55,7 @@
cipherData = new CipherData ();
encoding = null;
encryptionMethod = null;
- encryptionProperties = new EncryptionProperties ();
+ encryptionProperties = new EncryptionPropertyCollection
();
id = null;
keyInfo = new KeyInfo ();
mimeType = null;
@@ -81,7 +81,7 @@
set { encryptionMethod = value; }
}
- public virtual EncryptionProperties EncryptionProperties {
+ public virtual EncryptionPropertyCollection
EncryptionProperties {
get { return encryptionProperties; }
set { encryptionProperties = value; }
}
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedXml.cs
===================================================================
---
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedXml.cs
2005-04-24 15:42:31 UTC (rev 43513)
+++
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedXml.cs
2005-04-24 16:16:23 UTC (rev 43514)
@@ -53,7 +53,7 @@
public const string XmlEncElementUrl =
XmlEncNamespaceUrl + "Element";
public const string XmlEncEncryptedKeyUrl =
XmlEncNamespaceUrl + "EncryptedKey";
public const string XmlEncNamespaceUrl =
"http://www.w3.org/2001/04/xmlenc#";;
- public const string XmlEncRSA1_5Url =
XmlEncNamespaceUrl + "rsa-1_5";
+ public const string XmlEncRSA15Url =
XmlEncNamespaceUrl + "rsa-1_5";
public const string XmlEncRSAOAEPUrl =
XmlEncNamespaceUrl + "rsa-oaep-mgf1p";
public const string XmlEncSHA256Url =
XmlEncNamespaceUrl + "sha256";
public const string XmlEncSHA512Url =
XmlEncNamespaceUrl + "sha512";
@@ -165,7 +165,7 @@
}
}
switch (encryptedKey.EncryptionMethod.KeyAlgorithm) {
- case XmlEncRSA1_5Url:
+ case XmlEncRSA15Url:
return DecryptKey
(encryptedKey.CipherData.CipherValue, (RSA) keyAlg, false);
case XmlEncRSAOAEPUrl:
return DecryptKey
(encryptedKey.CipherData.CipherValue, (RSA) keyAlg, true);
@@ -353,7 +353,7 @@
}
}
else if (keyAlg is RSA)
- return XmlEncRSA1_5Url;
+ return XmlEncRSA15Url;
else if (keyAlg is TripleDES)
return XmlEncTripleDESKeyWrapUrl;
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptionProperties.cs
===================================================================
---
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptionProperties.cs
2005-04-24 15:42:31 UTC (rev 43513)
+++
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptionProperties.cs
2005-04-24 16:16:23 UTC (rev 43514)
@@ -34,8 +34,9 @@
using System.Xml;
namespace System.Security.Cryptography.Xml {
- public sealed class EncryptionProperties : IList, ICollection,
IEnumerable {
+ public sealed class EncryptionPropertyCollection : IList, ICollection,
IEnumerable {
+
#region Fields
ArrayList list;
@@ -44,7 +45,7 @@
#region Constructors
- public EncryptionProperties ()
+ public EncryptionPropertyCollection ()
{
list = new ArrayList ();
}
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/KeyInfoRetrievalMethod.cs
===================================================================
---
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/KeyInfoRetrievalMethod.cs
2005-04-24 15:42:31 UTC (rev 43513)
+++
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/KeyInfoRetrievalMethod.cs
2005-04-24 16:16:23 UTC (rev 43514)
@@ -2,14 +2,13 @@
// KeyInfoRetrievalMethod.cs - KeyInfoRetrievalMethod implementation for XML
Signature
//
// Author:
-// Sebastien Pouliot ([EMAIL PROTECTED])
+// Sebastien Pouliot <[EMAIL PROTECTED]>
// Tim Coleman ([EMAIL PROTECTED])
//
// (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
// Copyright (C) Tim Coleman, 2004
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
//
-
-//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
@@ -30,6 +29,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+using System.Runtime.InteropServices;
using System.Xml;
namespace System.Security.Cryptography.Xml {
@@ -38,12 +38,13 @@
private string URI;
private XmlElement element;
-
#if NET_2_0
- string type;
+ private string type;
#endif
- public KeyInfoRetrievalMethod () {}
+ public KeyInfoRetrievalMethod ()
+ {
+ }
public KeyInfoRetrievalMethod (string strUri)
{
@@ -57,6 +58,7 @@
Type = strType;
}
+ [ComVisible (false)]
public string Type {
get { return type; }
set {
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/KeyInfoX509Data.cs
===================================================================
---
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/KeyInfoX509Data.cs
2005-04-24 15:42:31 UTC (rev 43513)
+++
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/KeyInfoX509Data.cs
2005-04-24 16:16:23 UTC (rev 43514)
@@ -8,10 +8,8 @@
//
// (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
// Copyright (C) Tim Coleman, 2004
-// (C) 2004 Novell Inc.
+// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
//
-
-//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
@@ -33,6 +31,7 @@
//
using System.Collections;
+using System.Runtime.InteropServices;
using System.Security.Cryptography.X509Certificates;
using System.Xml;
@@ -65,9 +64,9 @@
}
#if NET_2_0
+ [MonoTODO]
public KeyInfoX509Data (X509Certificate cert, X509IncludeOption
includeOption)
{
-
}
#endif
@@ -105,14 +104,14 @@
public void AddSubjectKeyId (byte[] subjectKeyId)
{
- SubjectKeyIdList.Add (subjectKeyId);
+ SubjectKeyIdList.Add (Convert.ToBase64String
(subjectKeyId));
}
#if NET_2_0
- [MonoTODO]
+ [ComVisible (false)]
public void AddSubjectKeyId (string subjectKeyId)
{
- throw new NotImplementedException ();
+ SubjectKeyIdList.Add (subjectKeyId);
}
#endif
@@ -147,9 +146,9 @@
}
// <X509SKI>
if (SubjectKeyIdList.Count > 0) {
- foreach (byte[] skid in SubjectKeyIdList) {
+ foreach (string skid in SubjectKeyIdList) {
XmlElement ski = document.CreateElement
(XmlSignature.ElementNames.X509SKI, XmlSignature.NamespaceURI);
- ski.InnerText = Convert.ToBase64String
(skid);
+ ski.InnerText = skid;
xel.AppendChild (ski);
}
}
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/Reference.cs
===================================================================
---
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/Reference.cs
2005-04-24 15:42:31 UTC (rev 43513)
+++
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/Reference.cs
2005-04-24 16:16:23 UTC (rev 43514)
@@ -5,10 +5,8 @@
// Sebastien Pouliot <[EMAIL PROTECTED]>
//
// (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
-// (C) 2004 Novell (http://www.novell.com)
+// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
//
-
-//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
@@ -30,6 +28,7 @@
//
using System.IO;
+using System.Runtime.InteropServices;
using System.Xml;
namespace System.Security.Cryptography.Xml {
@@ -91,6 +90,7 @@
public TransformChain TransformChain {
get { return chain; }
#if NET_2_0
+ [ComVisible (false)]
set { chain = value; }
#endif
}
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/ReferenceList.cs
===================================================================
---
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/ReferenceList.cs
2005-04-24 15:42:31 UTC (rev 43513)
+++
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/ReferenceList.cs
2005-04-24 16:16:23 UTC (rev 43514)
@@ -62,21 +62,21 @@
set { this [index] = (EncryptedReference) value; }
}
- public bool IsFixedSize {
- get { return list.IsFixedSize; }
+ bool IList.IsFixedSize {
+ get { return false; }
}
- public bool IsReadOnly {
- get { return list.IsReadOnly; }
+ bool IList.IsReadOnly {
+ get { return false; }
}
public bool IsSynchronized {
get { return list.IsSynchronized; }
}
- public EncryptedReference this [int oid] {
- get { return (EncryptedReference) list [oid]; }
- set { this [oid] = value; }
+ public EncryptedReference this [int index] {
+ get { return (EncryptedReference) list [index]; }
+ set { this [index] = value; }
}
public object SyncRoot {
@@ -114,6 +114,11 @@
return list.GetEnumerator ();
}
+ public EncryptedReference Item (int index)
+ {
+ return (EncryptedReference) list [index];
+ }
+
public int IndexOf (object value)
{
return list.IndexOf (value);
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/SignedInfo.cs
===================================================================
---
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/SignedInfo.cs
2005-04-24 15:42:31 UTC (rev 43513)
+++
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/SignedInfo.cs
2005-04-24 16:16:23 UTC (rev 43514)
@@ -7,10 +7,8 @@
//
// (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
// Copyright (C) Tim Coleman, 2004
-// (C) 2004 Novell (http://www.novell.com)
+// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
//
-
-//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
@@ -32,6 +30,7 @@
//
using System.Collections;
+using System.Runtime.InteropServices;
using System.Xml;
namespace System.Security.Cryptography.Xml {
@@ -67,6 +66,7 @@
}
#if NET_2_0
+ [ComVisible (false)]
public Transform CanonicalizationMethodObject {
get { return canonicalizationMethodObject; }
}
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/SignedXml.cs
===================================================================
---
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/SignedXml.cs
2005-04-24 15:42:31 UTC (rev 43513)
+++
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/SignedXml.cs
2005-04-24 16:16:23 UTC (rev 43514)
@@ -66,6 +66,7 @@
public const string XmlDsigExcC14NWithCommentsTransformUrl
= XmlDsigExcC14NTransformUrl + "WithComments";
public const string XmlDsigXPathTransformUrl
= "http://www.w3.org/TR/1999/REC-xpath-19991116";;
public const string XmlDsigXsltTransformUrl
= "http://www.w3.org/TR/1999/REC-xslt-19991116";;
+ public const string XmlLicenseTransformUrl
= "urn:mpeg:mpeg21:2003:01-REL-R-NS:licenseTransform";
private EncryptedXml encryptedXml;
#endif
@@ -110,6 +111,7 @@
}
#if NET_2_0
+ [ComVisible (false)]
public EncryptedXml EncryptedXml {
get { return encryptedXml; }
set { encryptedXml = value; }
@@ -588,6 +590,7 @@
#if NET_2_0
[MonoTODO]
+ [ComVisible (false)]
public bool CheckSignature (X509Certificate2 certificate, bool
verifySignatureOnly)
{
throw new NotImplementedException ();
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/Transform.cs
===================================================================
---
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/Transform.cs
2005-04-24 15:42:31 UTC (rev 43513)
+++
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/Transform.cs
2005-04-24 16:16:23 UTC (rev 43514)
@@ -8,10 +8,8 @@
//
// (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
// Copyright (C) Tim Coleman, 2004
-// (C) 2004 Novell (http://www.novell.com)
+// Copyright (C) 2004-2005 Novell Inc. (http://www.novell.com)
//
-
-//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
@@ -79,15 +77,16 @@
#if NET_2_0
[MonoTODO]
+ [ComVisible (false)]
public XmlElement Context {
get { throw new NotImplementedException (); }
set { throw new NotImplementedException (); }
}
[MonoTODO]
+ [ComVisible (false)]
public Hashtable PropagatedNamespaces {
get { throw new NotImplementedException (); }
- set { throw new NotImplementedException (); }
}
#endif
@@ -95,6 +94,7 @@
#region Methods
#if NET_2_0
+ [ComVisible (false)]
public virtual byte[] GetDigestedOutput (HashAlgorithm hash)
{
return hash.ComputeHash ((Stream) GetOutput (typeof
(Stream)));
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/X509IssuerSerial.cs
===================================================================
---
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/X509IssuerSerial.cs
2005-04-24 15:42:31 UTC (rev 43513)
+++
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/X509IssuerSerial.cs
2005-04-24 16:16:23 UTC (rev 43514)
@@ -6,7 +6,7 @@
// Sebastien Pouliot <[EMAIL PROTECTED]>
//
// Copyright (C) Tim Coleman, 2004
-// Copyright (C) 2004 Novell Inc. (http://www.novell.com)
+// Copyright (C) 2004-2005 Novell Inc. (http://www.novell.com)
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
@@ -37,14 +37,25 @@
internal
#endif
struct X509IssuerSerial {
- public string IssuerName;
- public string SerialNumber;
+ private string _issuerName;
+ private string _serialNumber;
+
internal X509IssuerSerial (string issuer, string serial)
{
- IssuerName = issuer;
- SerialNumber = serial;
+ _issuerName = issuer;
+ _serialNumber = serial;
}
+
+ public string IssuerName {
+ get { return _issuerName; }
+ set { _issuerName = value; }
+ }
+
+ public string SerialNumber {
+ get { return _serialNumber; }
+ set { _serialNumber = value; }
+ }
}
}
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlDsigC14NTransform.cs
===================================================================
---
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlDsigC14NTransform.cs
2005-04-24 15:42:31 UTC (rev 43513)
+++
trunk/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlDsigC14NTransform.cs
2005-04-24 16:16:23 UTC (rev 43514)
@@ -10,10 +10,8 @@
// (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
// (C) 2003 Aleksey Sanin ([EMAIL PROTECTED])
// Copyright (C) Tim Coleman, 2004
-// (C) 2004 Novell (http://www.novell.com)
+// Copyright (C) 2004-2005 Novell Inc. (http://www.novell.com)
//
-
-//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
@@ -36,6 +34,7 @@
using System.Collections;
using System.IO;
+using System.Runtime.InteropServices;
using System.Text;
using System.Xml;
@@ -94,10 +93,10 @@
}
#if NET_2_0
- [MonoTODO]
+ [ComVisible (false)]
public override byte[] GetDigestedOutput (HashAlgorithm hash)
{
- throw new NotImplementedException ();
+ return hash.ComputeHash ((Stream) GetOutput ());
}
#endif
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
