X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Security%2FSystem.Security.Cryptography.Pkcs%2FPkcs9Attribute.cs;h=d41c06c8d6be44c5039efa4affdd00c4dbd13d7d;hb=b7e80009158717d96fdbb42e93c10ebd927fd6a8;hp=dff8e295f10ed6c5a6d2b83571a60b8cfb5a7842;hpb=d4257ef3dc3d8adf23b2744130952b26303f5d33;p=mono.git

diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9Attribute.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9Attribute.cs
old mode 100755
new mode 100644
index dff8e295f10..d41c06c8d6b
--- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9Attribute.cs
+++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9Attribute.cs
@@ -1,12 +1,11 @@
 //
-// Pkcs9Attribute.cs - System.Security.Cryptography.Pkcs.Pkcs9Attribute
+// System.Security.Cryptography.Pkcs.Pkcs9AttributeObject class
 //
 // Author:
-//	Sebastien Pouliot (spouliot@motus.com)
+//	Sebastien Pouliot  <sebastien@ximian.com>
 //
 // (C) 2003 Motus Technologies Inc. (http://www.motus.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
@@ -28,23 +27,53 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
+#if SECURITY_DEP
 
-using System;
 using System.Collections;
 
 namespace System.Security.Cryptography.Pkcs {
 
-	public class Pkcs9Attribute : CryptographicAttribute {
+	public class Pkcs9AttributeObject : AsnEncodedData {
 
 		// constructors
 
-		public Pkcs9Attribute (Oid oid) : base (oid) {}
+		public Pkcs9AttributeObject () 
+			: base ()
+		{
+		}
+
+		public Pkcs9AttributeObject (AsnEncodedData asnEncodedData)
+			: base (asnEncodedData)
+		{
+		}
+
+		public Pkcs9AttributeObject (Oid oid, byte[] encodedData) 
+		{
+			if (oid == null)
+				throw new ArgumentNullException ("oid");
+			base.Oid = oid;
+			RawData = encodedData;
+		}
+
+		public Pkcs9AttributeObject (string oid, byte[] encodedData)
+			: base (oid, encodedData) 
+		{
+		}
+
+		// this (sadly) removes the "set" accessor
+		public new Oid Oid {
+			get { return base.Oid; }
+			internal set { base.Oid = value; }
+		}
 
-		public Pkcs9Attribute (Oid oid, ArrayList values) : base (oid, values) {}
+		public override void CopyFrom (AsnEncodedData asnEncodedData)
+		{
+			if (asnEncodedData == null)
+				throw new ArgumentNullException ("asnEncodedData");
 
-		public Pkcs9Attribute (Oid oid, object value) : base (oid, value) {}
+			throw new ArgumentException ("Cannot convert the PKCS#9 attribute.");
+		}
 	}
 }
 
-#endif
\ No newline at end of file
+#endif