diff options
author | David Hook <david.hook@keyfactor.com> | 2022-10-29 18:56:29 +1100 |
---|---|---|
committer | David Hook <david.hook@keyfactor.com> | 2022-10-29 18:56:29 +1100 |
commit | 590610a1faf81601756bfc683154446802157c86 (patch) | |
tree | 871ef215c63025dfea08a4cdd99120ad8a07fa45 /crypto/src/asn1/cmp/RevAnnContent.cs | |
parent | Merge remote-tracking branch 'refs/remotes/origin/master' (diff) | |
parent | Release preparations (diff) | |
download | BouncyCastle.NET-ed25519-590610a1faf81601756bfc683154446802157c86.tar.xz |
resolve conflicts
Diffstat (limited to 'crypto/src/asn1/cmp/RevAnnContent.cs')
-rw-r--r-- | crypto/src/asn1/cmp/RevAnnContent.cs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/crypto/src/asn1/cmp/RevAnnContent.cs b/crypto/src/asn1/cmp/RevAnnContent.cs index 4ef6fdbf7..cdd26c39f 100644 --- a/crypto/src/asn1/cmp/RevAnnContent.cs +++ b/crypto/src/asn1/cmp/RevAnnContent.cs @@ -19,18 +19,18 @@ namespace Org.BouncyCastle.Asn1.Cmp private readonly PkiStatusEncodable m_status; private readonly CertId m_certID; - private readonly DerGeneralizedTime m_willBeRevokedAt; - private readonly DerGeneralizedTime m_badSinceDate; + private readonly Asn1GeneralizedTime m_willBeRevokedAt; + private readonly Asn1GeneralizedTime m_badSinceDate; private readonly X509Extensions m_crlDetails; - public RevAnnContent(PkiStatusEncodable status, CertId certID, DerGeneralizedTime willBeRevokedAt, - DerGeneralizedTime badSinceDate) + public RevAnnContent(PkiStatusEncodable status, CertId certID, Asn1GeneralizedTime willBeRevokedAt, + Asn1GeneralizedTime badSinceDate) : this(status, certID, willBeRevokedAt, badSinceDate, null) { } - public RevAnnContent(PkiStatusEncodable status, CertId certID, DerGeneralizedTime willBeRevokedAt, - DerGeneralizedTime badSinceDate, X509Extensions crlDetails) + public RevAnnContent(PkiStatusEncodable status, CertId certID, Asn1GeneralizedTime willBeRevokedAt, + Asn1GeneralizedTime badSinceDate, X509Extensions crlDetails) { m_status = status; m_certID = certID; @@ -43,8 +43,8 @@ namespace Org.BouncyCastle.Asn1.Cmp { m_status = PkiStatusEncodable.GetInstance(seq[0]); m_certID = CertId.GetInstance(seq[1]); - m_willBeRevokedAt = DerGeneralizedTime.GetInstance(seq[2]); - m_badSinceDate = DerGeneralizedTime.GetInstance(seq[3]); + m_willBeRevokedAt = Asn1GeneralizedTime.GetInstance(seq[2]); + m_badSinceDate = Asn1GeneralizedTime.GetInstance(seq[3]); if (seq.Count > 4) { @@ -56,9 +56,9 @@ namespace Org.BouncyCastle.Asn1.Cmp public virtual CertId CertID => m_certID; - public virtual DerGeneralizedTime WillBeRevokedAt => m_willBeRevokedAt; + public virtual Asn1GeneralizedTime WillBeRevokedAt => m_willBeRevokedAt; - public virtual DerGeneralizedTime BadSinceDate => m_badSinceDate; + public virtual Asn1GeneralizedTime BadSinceDate => m_badSinceDate; public virtual X509Extensions CrlDetails => m_crlDetails; |