From 05df451257320bf8dfd86f7fdd4d63f9c78dd691 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Wed, 12 Aug 2020 15:42:18 +0200 Subject: openpgp: Make SKESK?::esk and SKESK5::aead_iv fallible. --- tool/src/commands/dump.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'tool/src/commands') diff --git a/tool/src/commands/dump.rs b/tool/src/commands/dump.rs index b149f837..12752a44 100644 --- a/tool/src/commands/dump.rs +++ b/tool/src/commands/dump.rs @@ -654,7 +654,7 @@ impl PacketDumper { s.symmetric_algo())?; write!(output, "{} S2K: ", i)?; self.dump_s2k(output, i, s.s2k())?; - if let Some(esk) = s.esk() { + if let Ok(Some(esk)) = s.esk() { writeln!(output, "{} ESK: {}", i, hex::encode(esk))?; } @@ -667,9 +667,11 @@ impl PacketDumper { s.aead_algo())?; write!(output, "{} S2K: ", i)?; self.dump_s2k(output, i, s.s2k())?; - writeln!(output, "{} IV: {}", i, - hex::encode(s.aead_iv()))?; - if let Some(esk) = s.esk() { + if let Ok(iv) = s.aead_iv() { + writeln!(output, "{} IV: {}", i, + hex::encode(iv))?; + } + if let Ok(Some(esk)) = s.esk() { writeln!(output, "{} ESK: {}", i, hex::encode(esk))?; } -- cgit v1.2.3