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/PKIHeader.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/PKIHeader.cs')
-rw-r--r-- | crypto/src/asn1/cmp/PKIHeader.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/src/asn1/cmp/PKIHeader.cs b/crypto/src/asn1/cmp/PKIHeader.cs index 553a81bc0..7ed914e6a 100644 --- a/crypto/src/asn1/cmp/PKIHeader.cs +++ b/crypto/src/asn1/cmp/PKIHeader.cs @@ -19,7 +19,7 @@ namespace Org.BouncyCastle.Asn1.Cmp private readonly DerInteger pvno; private readonly GeneralName sender; private readonly GeneralName recipient; - private readonly DerGeneralizedTime messageTime; + private readonly Asn1GeneralizedTime messageTime; private readonly AlgorithmIdentifier protectionAlg; private readonly Asn1OctetString senderKID; // KeyIdentifier private readonly Asn1OctetString recipKID; // KeyIdentifier @@ -42,7 +42,7 @@ namespace Org.BouncyCastle.Asn1.Cmp switch (tObj.TagNo) { case 0: - messageTime = DerGeneralizedTime.GetInstance(tObj, true); + messageTime = Asn1GeneralizedTime.GetInstance(tObj, true); break; case 1: protectionAlg = AlgorithmIdentifier.GetInstance(tObj, true); @@ -118,7 +118,7 @@ namespace Org.BouncyCastle.Asn1.Cmp get { return recipient; } } - public virtual DerGeneralizedTime MessageTime + public virtual Asn1GeneralizedTime MessageTime { get { return messageTime; } } |