From ef437f8efb1ddef3bd09427274b160e17a5cbf93 Mon Sep 17 00:00:00 2001
From: "Neal H. Walfield" <neal@pep.foundation>
Date: Wed, 18 Sep 2019 10:54:38 +0200
Subject: openpgp: Combine Signature4::key_expired and its _at variant.

  - Combine Signature4::key_expired and Signature4::key_expired_at.

  - Use an Into<Option<time::Tm>> to distinguish the two previous
    cases: the current time (None), and a specific time (a time::Tm).
---
 tool/src/commands/inspect.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tool/src')

diff --git a/tool/src/commands/inspect.rs b/tool/src/commands/inspect.rs
index ac167e12..e1e8a217 100644
--- a/tool/src/commands/inspect.rs
+++ b/tool/src/commands/inspect.rs
@@ -176,7 +176,7 @@ fn inspect_key<P, R>(output: &mut io::Write,
               R: openpgp::packet::key::KeyRole
 {
     if let Some(sig) = binding_signature {
-        if sig.key_expired(key) {
+        if sig.key_expired(key, None) {
             writeln!(output, "{}                 Expired", indent)?;
         } else if ! sig.key_alive(key) {
             writeln!(output, "{}                 Not yet valid", indent)?;
-- 
cgit v1.2.3