diff options
Diffstat (limited to 'tool/src')
| -rw-r--r-- | tool/src/commands/dump.rs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tool/src/commands/dump.rs b/tool/src/commands/dump.rs index 54aa407b..6b696ff3 100644 --- a/tool/src/commands/dump.rs +++ b/tool/src/commands/dump.rs @@ -1,7 +1,7 @@ use std::io::{self, Read}; extern crate sequoia_openpgp as openpgp; -use self::openpgp::types::{Timestamp, SymmetricAlgorithm}; +use self::openpgp::types::{Duration, Timestamp, SymmetricAlgorithm}; use self::openpgp::conversions::hex; use self::openpgp::crypto::mpis; use self::openpgp::{Packet, Result}; @@ -34,6 +34,12 @@ impl Convert<chrono::Duration> for std::time::Duration { } } +impl Convert<chrono::Duration> for Duration { + fn convert(self) -> chrono::Duration { + chrono::Duration::seconds(self.as_secs() as i64) + } +} + impl Convert<chrono::DateTime<chrono::offset::Utc>> for std::time::SystemTime { fn convert(self) -> chrono::DateTime<chrono::offset::Utc> { chrono::DateTime::<chrono::offset::Utc>::from(self) @@ -733,7 +739,7 @@ impl PacketDumper { write!(output, "{} Signature expiration time: {} ({})", i, t.convert(), if let Some(creation) = sig.signature_creation_time() { - (creation + *t).convert().to_string() + (creation + t.clone().into()).convert().to_string() } else { " (no Signature Creation Time subpacket)".into() })?, |