diff options
Diffstat (limited to 'crypto/src/x509/store')
-rw-r--r-- | crypto/src/x509/store/X509AttrCertStoreSelector.cs | 5 | ||||
-rw-r--r-- | crypto/src/x509/store/X509CertStoreSelector.cs | 9 | ||||
-rw-r--r-- | crypto/src/x509/store/X509CrlStoreSelector.cs | 7 |
3 files changed, 9 insertions, 12 deletions
diff --git a/crypto/src/x509/store/X509AttrCertStoreSelector.cs b/crypto/src/x509/store/X509AttrCertStoreSelector.cs index 5744289e9..e68208c74 100644 --- a/crypto/src/x509/store/X509AttrCertStoreSelector.cs +++ b/crypto/src/x509/store/X509AttrCertStoreSelector.cs @@ -5,7 +5,6 @@ using Org.BouncyCastle.Asn1; using Org.BouncyCastle.Asn1.X509; using Org.BouncyCastle.Math; using Org.BouncyCastle.Utilities.Collections; -using Org.BouncyCastle.Utilities.Date; using Org.BouncyCastle.X509.Extension; namespace Org.BouncyCastle.X509.Store @@ -23,7 +22,7 @@ namespace Org.BouncyCastle.X509.Store // TODO: name constraints??? private X509V2AttributeCertificate attributeCert; - private DateTimeObject attributeCertificateValid; + private DateTime? attributeCertificateValid; private AttributeCertificateHolder holder; private AttributeCertificateIssuer issuer; private BigInteger serialNumber; @@ -162,7 +161,7 @@ namespace Org.BouncyCastle.X509.Store /// <summary>The criteria for validity</summary> /// <remarks>If <c>null</c> is given any will do.</remarks> - public DateTimeObject AttributeCertificateValid + public DateTime? AttributeCertificateValid { get { return attributeCertificateValid; } set { this.attributeCertificateValid = value; } diff --git a/crypto/src/x509/store/X509CertStoreSelector.cs b/crypto/src/x509/store/X509CertStoreSelector.cs index 71b5419a7..357b5e76d 100644 --- a/crypto/src/x509/store/X509CertStoreSelector.cs +++ b/crypto/src/x509/store/X509CertStoreSelector.cs @@ -6,7 +6,6 @@ using Org.BouncyCastle.Asn1.X509; using Org.BouncyCastle.Math; using Org.BouncyCastle.Utilities; using Org.BouncyCastle.Utilities.Collections; -using Org.BouncyCastle.Utilities.Date; using Org.BouncyCastle.X509.Extension; namespace Org.BouncyCastle.X509.Store @@ -19,13 +18,13 @@ namespace Org.BouncyCastle.X509.Store private byte[] authorityKeyIdentifier; private int basicConstraints = -1; private X509Certificate certificate; - private DateTimeObject certificateValid; + private DateTime? certificateValid; private ISet<DerObjectIdentifier> extendedKeyUsage; private bool ignoreX509NameOrdering; private X509Name issuer; private bool[] keyUsage; private ISet<DerObjectIdentifier> policy; - private DateTimeObject privateKeyValid; + private DateTime? privateKeyValid; private BigInteger serialNumber; private X509Name subject; private byte[] subjectKeyIdentifier; @@ -85,7 +84,7 @@ namespace Org.BouncyCastle.X509.Store set { this.certificate = value; } } - public DateTimeObject CertificateValid + public DateTime? CertificateValid { get { return certificateValid; } set { certificateValid = value; } @@ -124,7 +123,7 @@ namespace Org.BouncyCastle.X509.Store set { policy = CopySet(value); } } - public DateTimeObject PrivateKeyValid + public DateTime? PrivateKeyValid { get { return privateKeyValid; } set { privateKeyValid = value; } diff --git a/crypto/src/x509/store/X509CrlStoreSelector.cs b/crypto/src/x509/store/X509CrlStoreSelector.cs index 365ec1d38..9e84b82ae 100644 --- a/crypto/src/x509/store/X509CrlStoreSelector.cs +++ b/crypto/src/x509/store/X509CrlStoreSelector.cs @@ -6,7 +6,6 @@ using Org.BouncyCastle.Asn1.X509; using Org.BouncyCastle.Math; using Org.BouncyCastle.Utilities; using Org.BouncyCastle.Utilities.Collections; -using Org.BouncyCastle.Utilities.Date; using Org.BouncyCastle.X509.Extension; namespace Org.BouncyCastle.X509.Store @@ -17,7 +16,7 @@ namespace Org.BouncyCastle.X509.Store // TODO Missing criteria? private X509Certificate certificateChecking; - private DateTimeObject dateAndTime; + private DateTime? dateAndTime; private IList<X509Name> issuers; private BigInteger maxCrlNumber; private BigInteger minCrlNumber; @@ -61,7 +60,7 @@ namespace Org.BouncyCastle.X509.Store set { certificateChecking = value; } } - public DateTimeObject DateAndTime + public DateTime? DateAndTime { get { return dateAndTime; } set { dateAndTime = value; } @@ -190,7 +189,7 @@ namespace Org.BouncyCastle.X509.Store { DateTime dt = dateAndTime.Value; DateTime tu = c.ThisUpdate; - DateTimeObject nu = c.NextUpdate; + DateTime? nu = c.NextUpdate; if (dt.CompareTo(tu) < 0 || nu == null || dt.CompareTo(nu.Value) >= 0) return false; |