summaryrefslogtreecommitdiffstats
path: root/openpgp/src/parse
diff options
context:
space:
mode:
authorJustus Winter <justus@sequoia-pgp.org>2019-11-25 15:59:54 +0100
committerJustus Winter <justus@sequoia-pgp.org>2019-12-09 13:26:48 +0100
commitfe8093bc1aef8c6a79fd1dc76f5cc857eae05d50 (patch)
tree1aa3021d49ec099e16083f12ca4aefcbf5fa1313 /openpgp/src/parse
parent531e3252b86f6eacf02d7181c280e8c01c4a55f4 (diff)
openpgp: Return Result from Signature::key_alive.
- See #371.
Diffstat (limited to 'openpgp/src/parse')
-rw-r--r--openpgp/src/parse/stream.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/openpgp/src/parse/stream.rs b/openpgp/src/parse/stream.rs
index ed8444ef..c4b16049 100644
--- a/openpgp/src/parse/stream.rs
+++ b/openpgp/src/parse/stream.rs
@@ -569,7 +569,7 @@ impl<'a, H: VerificationHelper> Verifier<'a, H> {
sig.key_flags().for_signing()
// Check expiry.
&& sig.signature_alive(time, tolerance).is_ok()
- && sig.key_alive(key, time)
+ && sig.key_alive(key, time).is_ok()
} else {
false
}
@@ -1442,7 +1442,7 @@ impl<'a, H: VerificationHelper + DecryptionHelper> Decryptor<'a, H> {
// Check expiry.
&& sig.signature_alive(time, tolerance)
.is_ok()
- && sig.key_alive(key, time)
+ && sig.key_alive(key, time).is_ok()
} else {
false
}