diff options
| author | Neal H. Walfield <neal@pep.foundation> | 2019-09-18 14:23:55 +0200 |
|---|---|---|
| committer | Neal H. Walfield <neal@pep.foundation> | 2019-09-18 15:22:50 +0200 |
| commit | 212202e5bec054cc3b2b83edffdd8b83db5bf011 (patch) | |
| tree | c70a8449148eaf23af1bb6d7ee15fd0aba4a029f /openpgp/src/parse | |
| parent | 446dfdbcb63af00daa3a777958419e1dfb6fc737 (diff) | |
openpgp: Combine Signature4::key_alive and its _at variant.
- Combine Signature4::key_alive and Signature4::key_alive_at.
- Use an Into<Option<time::Tm>> to distinguish the two previous
cases: the current time (None), and a specific time (a time::Tm).
Diffstat (limited to 'openpgp/src/parse')
| -rw-r--r-- | openpgp/src/parse/stream.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openpgp/src/parse/stream.rs b/openpgp/src/parse/stream.rs index 4565db6c..7ab8033d 100644 --- a/openpgp/src/parse/stream.rs +++ b/openpgp/src/parse/stream.rs @@ -480,7 +480,7 @@ impl<'a, H: VerificationHelper> Verifier<'a, H> { sig.key_flags().can_sign() // Check expiry. && sig.signature_alive_at(t) - && sig.key_alive_at(key, t) + && sig.key_alive(key, t) } else { false } @@ -1299,7 +1299,7 @@ impl<'a, H: VerificationHelper + DecryptionHelper> Decryptor<'a, H> { sig.key_flags().can_sign() // Check expiry. && sig.signature_alive_at(t) - && sig.key_alive_at(key, t) + && sig.key_alive(key, t) } else { false } |