2005-05-03 Sebastien Pouliot <sebastien@ximian.com>

* AsnEncodedData.cs: Allow CopyFrom to work even without an OID. svn path=/trunk/mcs/; revision=43971
baulig · May 3, 2005 · 9d8c350 · 9d8c350
1 parent 7a59899
commit 9d8c350
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/mcs/class/System.Security/System.Security.Cryptography/AsnEncodedData.cs b/mcs/class/System.Security/System.Security.Cryptography/AsnEncodedData.cs
@@ -115,7 +115,11 @@ public virtual void CopyFrom (AsnEncodedData asnEncodedData)
 			if (asnEncodedData == null)
 				throw new ArgumentNullException ("asnEncodedData");
 
-			Oid = new Oid (asnEncodedData._oid);
+			if (asnEncodedData._oid == null)
+				Oid = null;
+			else
+				Oid = new Oid (asnEncodedData._oid);
+
 			RawData = asnEncodedData._raw;
 		}
 

diff --git a/mcs/class/System.Security/System.Security.Cryptography/ChangeLog b/mcs/class/System.Security/System.Security.Cryptography/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-03  Sebastien Pouliot  <sebastien@ximian.com>
+
+	* AsnEncodedData.cs: Allow CopyFrom to work even without an OID.
+
 2005-04-25  Sebastien Pouliot  <sebastien@ximian.com>
 
 	* AsnEncodedData.cs: Fix compiler warning (unused variable).