2004-07-08 Sebastien Pouliot <sebastien@ximian.com>

	* ContentInfo.cs: Added finalizer.
	* CmsRecipient.cs: New. Replace Pkcs7Recipient (from 1.2).
	* CmsRecipientCollection.cs: New. Replace Pkcs7RecipientCollection
	(from 1.2).
	* CmsRecipientEnumerator.cs: New. Replace Pkcs7RecipientEnumerator
	(from 1.2).
	* CmsSigner.cs: New. Replace Pkcs7Signer (from 1.2).
	* EnvelopedCms.cs: New. Replace EnvelopedPkcs7 (from 1.2).
	* KeyAgreeRecipientInfo.cs: Fixed internal constructor.
	* Pkcs9Attribute.cs: Now inherit from AsnEncodedData. Fixed
	constructors.
	* Pkcs9DocumentDescription.cs: Sealed class and fixed API.
	* Pkcs9DocumentName.cs: Sealed class and fixed API.
	* Pkcs9SigningTime.cs: Sealed class and fixed API.
	* PublicKeyInfo.cs: Sealed class.
	* RecipientInfo.cs: Removed protected constructor.
	* RecipientInfoCollection.cs: Sealed class.
	* RecipientInfoEnumerator.cs: Sealed class.
	* SignedCms.cs: New. Replace SignedPkcs7 (from 1.2).
	* SignerInfo.cs: Sealed class and fixed API.
	* SignerInfoCollection.cs: Sealed class and fixed CopyTo.
	* SignerInfoEnumerator.cs: Sealed class.
	* SubjectIdentifier.cs: Sealed class.
	* SubjectIdentifierOrKey.cs: Sealed class.
	* SubjectIdentifierType.cs: Fixed enum and added [Serializable].

svn path=/trunk/mcs/; revision=30907

1 files changed, 25 insertions, 8 deletions

diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9Attribute.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9Attribute.cs
index dff8e295f10..931ee9e2efb 100755
--- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9Attribute.cs
+++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9Attribute.cs
@@ -2,11 +2,10 @@
 // Pkcs9Attribute.cs - System.Security.Cryptography.Pkcs.Pkcs9Attribute
 //
 // Author:
-//	Sebastien Pouliot (spouliot@motus.com)
+//	Sebastien Pouliot  <sebastien@ximian.com>
 //
 // (C) 2003 Motus Technologies Inc. (http://www.motus.com)
-//
-
+// Copyright (C) 2004 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
@@ -35,16 +34,34 @@ using System.Collections;
 
 namespace System.Security.Cryptography.Pkcs {
 
-	public class Pkcs9Attribute : CryptographicAttribute {
+	public class Pkcs9Attribute : AsnEncodedData {
 
 		// constructors
 
-		public Pkcs9Attribute (Oid oid) : base (oid) {}
+		public Pkcs9Attribute () 
+			: base ()
+		{
+		}
+
+		public Pkcs9Attribute (AsnEncodedData asnEncodedData)
+			: base (asnEncodedData)
+		{
+		}
+
+		public Pkcs9Attribute (Oid oid, byte[] encodedData) 
+			: base (oid, encodedData)
+		{
+		}
 
-		public Pkcs9Attribute (Oid oid, ArrayList values) : base (oid, values) {}
+		public Pkcs9Attribute (string oid, byte[] encodedData)
+			: base (oid, encodedData) 
+		{
+		}
 
-		public Pkcs9Attribute (Oid oid, object value) : base (oid, value) {}
+		public new Oid Oid {
+			get { return base.Oid; }
+		}
 	}
 }
 
-#endif
\ No newline at end of file
+#endif