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/cms/KEKIdentifier.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/cms/KEKIdentifier.cs')
| -rw-r--r-- | crypto/src/asn1/cms/KEKIdentifier.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crypto/src/asn1/cms/KEKIdentifier.cs b/crypto/src/asn1/cms/KEKIdentifier.cs index a42217440..36ab94f52 100644 --- a/crypto/src/asn1/cms/KEKIdentifier.cs +++ b/crypto/src/asn1/cms/KEKIdentifier.cs @@ -8,12 +8,12 @@ namespace Org.BouncyCastle.Asn1.Cms : Asn1Encodable { private Asn1OctetString keyIdentifier; - private DerGeneralizedTime date; + private Asn1GeneralizedTime date; private OtherKeyAttribute other; public KekIdentifier( byte[] keyIdentifier, - DerGeneralizedTime date, + Asn1GeneralizedTime date, OtherKeyAttribute other) { this.keyIdentifier = new DerOctetString(keyIdentifier); @@ -31,9 +31,9 @@ namespace Org.BouncyCastle.Asn1.Cms case 1: break; case 2: - if (seq[1] is DerGeneralizedTime) + if (seq[1] is Asn1GeneralizedTime) { - date = (DerGeneralizedTime) seq[1]; + date = (Asn1GeneralizedTime) seq[1]; } else { @@ -41,7 +41,7 @@ namespace Org.BouncyCastle.Asn1.Cms } break; case 3: - date = (DerGeneralizedTime) seq[1]; + date = (Asn1GeneralizedTime) seq[1]; other = OtherKeyAttribute.GetInstance(seq[2]); break; default: @@ -88,7 +88,7 @@ namespace Org.BouncyCastle.Asn1.Cms get { return keyIdentifier; } } - public DerGeneralizedTime Date + public Asn1GeneralizedTime Date { get { return date; } } |