Merge pull request #1502 from madrang/SafeHandle.CloseTestDispose

[mono.git] / mcs / class / System.Security / System.Security.Cryptography.Pkcs / Pkcs9SigningTime.cs

diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9SigningTime.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9SigningTime.cs
index e2df1870ac048807df0c4657b5c992daa3c2f2d9..e1e7920bc8c7a77d921b3b9c7086807a703a14df 100644 (file)
--- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9SigningTime.cs
+++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9SigningTime.cs
@@ -27,7 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
+#if SECURITY_DEP
 
 using System.Globalization;
 using System.Text;
@@ -74,8 +74,12 @@ namespace System.Security.Cryptography.Pkcs {
 
                public override void CopyFrom (AsnEncodedData asnEncodedData)
                {
-                       base.CopyFrom (asnEncodedData);
-                       Decode (this.RawData);
+                       if (asnEncodedData == null)
+                               throw new ArgumentNullException ("asnEncodedData");
+
+                       Decode (asnEncodedData.RawData);
+                       Oid = asnEncodedData.Oid;
+                       RawData = asnEncodedData.RawData;
                }
 
                // internal stuff