From 531e3252b86f6eacf02d7181c280e8c01c4a55f4 Mon Sep 17 00:00:00 2001
From: Justus Winter <justus@sequoia-pgp.org>
Date: Mon, 25 Nov 2019 14:04:41 +0100
Subject: openpgp: Return Result from Signature::signature_alive.

  - See #371.
---
 openpgp/src/parse/stream.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'openpgp/src/parse')

diff --git a/openpgp/src/parse/stream.rs b/openpgp/src/parse/stream.rs
index 272fc78f..ed8444ef 100644
--- a/openpgp/src/parse/stream.rs
+++ b/openpgp/src/parse/stream.rs
@@ -568,7 +568,7 @@ impl<'a, H: VerificationHelper> Verifier<'a, H> {
             if let Some(sig) = sig {
                 sig.key_flags().for_signing()
                 // Check expiry.
-                    && sig.signature_alive(time, tolerance)
+                    && sig.signature_alive(time, tolerance).is_ok()
                     && sig.key_alive(key, time)
             } else {
                 false
@@ -704,6 +704,7 @@ impl<'a, H: VerificationHelper> Verifier<'a, H> {
                                     if sig.verify(key).unwrap_or(false) {
                                         if sig.signature_alive(
                                             self.time, self.clock_skew_tolerance)
+                                            .is_ok()
                                         {
                                             VerificationResult::GoodChecksum {
                                                 sig: sig.clone(),
@@ -1440,6 +1441,7 @@ impl<'a, H: VerificationHelper + DecryptionHelper> Decryptor<'a, H> {
                                 sig.key_flags().for_signing()
                                 // Check expiry.
                                     && sig.signature_alive(time, tolerance)
+                                       .is_ok()
                                     && sig.key_alive(key, time)
                             } else {
                                 false
@@ -1595,6 +1597,7 @@ impl<'a, H: VerificationHelper + DecryptionHelper> Decryptor<'a, H> {
                                     if sig.verify(key).unwrap_or(false) &&
                                         sig.signature_alive(
                                             self.time, self.clock_skew_tolerance)
+                                        .is_ok()
                                     {
                                         // Check intended recipients.
                                         if let Some(identity) =
-- 
cgit v1.2.3