diff options
author | Peter Dettman <peter.dettman@bouncycastle.org> | 2015-10-18 13:37:35 +0700 |
---|---|---|
committer | Peter Dettman <peter.dettman@bouncycastle.org> | 2015-10-18 13:37:35 +0700 |
commit | 460c3811712e3005f268c1d48d582cb65f6e0e78 (patch) | |
tree | 74590d7a229e6370bf7d843a5d6ec4af051d3c6b /crypto/src/asn1/x509 | |
parent | http://www.bouncycastle.org/jira/browse/BMA-128 (diff) | |
download | BouncyCastle.NET-ed25519-460c3811712e3005f268c1d48d582cb65f6e0e78.tar.xz |
http://www.bouncycastle.org/jira/browse/BMA-113
- Convert DateTime to string using InvariantCulture
Diffstat (limited to 'crypto/src/asn1/x509')
-rw-r--r-- | crypto/src/asn1/x509/Time.cs | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/crypto/src/asn1/x509/Time.cs b/crypto/src/asn1/x509/Time.cs index 0f2511e6d..8350339bb 100644 --- a/crypto/src/asn1/x509/Time.cs +++ b/crypto/src/asn1/x509/Time.cs @@ -1,11 +1,12 @@ using System; +using System.Globalization; namespace Org.BouncyCastle.Asn1.X509 { public class Time : Asn1Encodable, IAsn1Choice { - internal Asn1Object time; + private readonly Asn1Object time; public static Time GetInstance( Asn1TaggedObject obj, @@ -19,11 +20,8 @@ namespace Org.BouncyCastle.Asn1.X509 { if (time == null) throw new ArgumentNullException("time"); - if (!(time is DerUtcTime) && !(time is DerGeneralizedTime)) - { throw new ArgumentException("unknown object passed to Time"); - } this.time = time; } @@ -36,9 +34,9 @@ namespace Org.BouncyCastle.Asn1.X509 public Time( DateTime date) { - string d = date.ToString("yyyyMMddHHmmss") + "Z"; + string d = date.ToString("yyyyMMddHHmmss", CultureInfo.InvariantCulture) + "Z"; - int year = Int32.Parse(d.Substring(0, 4)); + int year = int.Parse(d.Substring(0, 4)); if (year < 1950 || year > 2049) { @@ -54,13 +52,11 @@ namespace Org.BouncyCastle.Asn1.X509 object obj) { if (obj == null || obj is Time) - return (Time) obj; - + return (Time)obj; if (obj is DerUtcTime) - return new Time((DerUtcTime) obj); - + return new Time((DerUtcTime)obj); if (obj is DerGeneralizedTime) - return new Time((DerGeneralizedTime) obj); + return new Time((DerGeneralizedTime)obj); throw new ArgumentException("unknown object in factory: " + obj.GetType().Name, "obj"); } |