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
old mode 100755 (executable)
new mode 100644 (file)
index 9ecb5d7..e1e7920
--- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9SigningTime.cs
+++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9SigningTime.cs
@@ -1,12 +1,11 @@
 //
-// Pkcs9SigningTime.cs - System.Security.Cryptography.Pkcs.Pkcs9SigningTime
+// System.Security.Cryptography.Pkcs.Pkcs9SigningTime 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,22 +27,88 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
+#if SECURITY_DEP
 
-using System;
+using System.Globalization;
+using System.Text;
+
+using Mono.Security;
 
 namespace System.Security.Cryptography.Pkcs {
 
-       public class Pkcs9SigningTime : Pkcs9Attribute {
+       public sealed class Pkcs9SigningTime : Pkcs9AttributeObject {
+
+               internal const string oid = "1.2.840.113549.1.9.5";
+               internal const string friendlyName = "Signing Time";
+
+               private DateTime _signingTime;
+
+               public Pkcs9SigningTime () 
+               {
+                       // Pkcs9Attribute remove the "set" accessor on Oid :-(
+                       (this as AsnEncodedData).Oid = new Oid (oid, friendlyName);
+                       _signingTime = DateTime.Now;
+                       RawData = Encode ();
+               }
+
+               public Pkcs9SigningTime (DateTime signingTime)
+               {
+                       (this as AsnEncodedData).Oid = new Oid (oid, friendlyName);
+                       _signingTime = signingTime;
+                       RawData = Encode ();
+               }
+
+               public Pkcs9SigningTime (byte[] encodedSigningTime)
+               {
+                       if (encodedSigningTime == null)
+                               throw new ArgumentNullException ("encodedSigningTime");
+
+                       (this as AsnEncodedData).Oid = new Oid (oid, friendlyName);
+                       RawData = encodedSigningTime;
+                       Decode (encodedSigningTime);
+               }
+
+               public DateTime SigningTime {
+                       get { return _signingTime; }
+               }
+
+               public override void CopyFrom (AsnEncodedData asnEncodedData)
+               {
+                       if (asnEncodedData == null)
+                               throw new ArgumentNullException ("asnEncodedData");
+
+                       Decode (asnEncodedData.RawData);
+                       Oid = asnEncodedData.Oid;
+                       RawData = asnEncodedData.RawData;
+               }
+
+               // internal stuff
+
+               internal void Decode (byte[] attribute)
+               {
+                       // Only UTCTIME is supported by FX 2.0
+                       if (attribute [0] != 0x17)
+                               throw new CryptographicException (Locale.GetText ("Only UTCTIME is supported."));
 
-               private const string oid = "1.2.840.113549.1.9.5";
-               private const string name = "Signing Time";
+                       ASN1 attr = new ASN1 (attribute);
+                       byte[] value = attr.Value;
+                       string date = Encoding.ASCII.GetString (value, 0, value.Length - 1);
+                       _signingTime = DateTime.ParseExact (date, "yyMMddHHmmss", null);
+               }
 
-               public Pkcs9SigningTime () : this (DateTime.Now) {}
+               internal byte[] Encode ()
+               {
+                       if (_signingTime.Year <= 1600)
+                               throw new ArgumentOutOfRangeException ("<= 1600");
+                       // Only UTCTIME is supported by FX 2.0
+                       if ((_signingTime.Year < 1950) || (_signingTime.Year >= 2050))
+                               throw new CryptographicException ("[1950,2049]");
 
-               public Pkcs9SigningTime (DateTime signingTime) 
-                       : base (new Oid (oid, name), signingTime)  {}
+                       string date = _signingTime.ToString ("yyMMddHHmmss", CultureInfo.InvariantCulture) + "Z";
+                       ASN1 attr = new ASN1 (0x17, Encoding.ASCII.GetBytes (date));
+                       return attr.GetBytes ();
+               }
        }
 }
 
-#endif
\ No newline at end of file
+#endif