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=811674bc6331c98d33134e2a37a7c7dd66402227;hp=1a6bdf82ae5f472466681958ed471cb8ba9dd72f;hpb=dfedf08d980d94226d3633164af1696343cbf717;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 1a6bdf82ae5..d41c06c8d6b
--- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9Attribute.cs
+++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9Attribute.cs
@@ -1,29 +1,79 @@
 //
-// 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
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// 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