diff options
author | Wiktor Kwapisiewicz <wiktor@metacode.biz> | 2020-09-18 10:10:39 +0200 |
---|---|---|
committer | Wiktor Kwapisiewicz <wiktor@metacode.biz> | 2020-09-21 09:33:19 +0200 |
commit | 1ef1c3fbaf97f8b4470024ae1f681b2534af9ed5 (patch) | |
tree | bcc36a44cf218ab12b9921f11cf89509a37a7e34 /openpgp/examples/sign-detached.rs | |
parent | ba79017328ce7dc444ee05a83f3a04f4f6ba9310 (diff) |
openpgp: Adjust examples to use try operator.
- Change `expect` to `context(...)?`,
- Change `unwrap` to `?`.
Diffstat (limited to 'openpgp/examples/sign-detached.rs')
-rw-r--r-- | openpgp/examples/sign-detached.rs | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/openpgp/examples/sign-detached.rs b/openpgp/examples/sign-detached.rs index 30da708b..f16b1e93 100644 --- a/openpgp/examples/sign-detached.rs +++ b/openpgp/examples/sign-detached.rs @@ -2,6 +2,9 @@ use std::env; use std::io; + +use anyhow::Context; + extern crate rpassword; extern crate sequoia_openpgp as openpgp; @@ -10,20 +13,20 @@ use crate::openpgp::parse::Parse; use crate::openpgp::serialize::stream::{Message, Signer}; use crate::openpgp::policy::StandardPolicy as P; -fn main() { +fn main() -> openpgp::Result<()> { let p = &P::new(); let args: Vec<String> = env::args().collect(); if args.len() < 2 { - panic!("A simple filter creating a detached signature.\n\n\ + return Err(anyhow::anyhow!("A simple filter creating a detached signature.\n\n\ Usage: {} <secret-keyfile> [<secret-keyfile>...] \ - <input >output\n", args[0]); + <input >output\n", args[0])); } // Read the transferable secret keys from the given files. let mut keys = Vec::new(); for filename in &args[1..] { let tsk = openpgp::Cert::from_file(filename) - .expect("Failed to read key"); + .context("Failed to read key")?; let mut n = 0; for key in tsk @@ -35,19 +38,19 @@ fn main() { if key.secret().is_encrypted() { let password = rpassword::read_password_from_tty( Some(&format!("Please enter password to decrypt \ - {}/{}: ",tsk, key))).unwrap(); + {}/{}: ",tsk, key)))?; let algo = key.pk_algo(); key.secret_mut() .decrypt_in_place(algo, &password.into()) - .expect("decryption failed"); + .context("decryption failed")?; } n += 1; - key.into_keypair().unwrap() + key.into_keypair()? }); } if n == 0 { - panic!("Found no suitable signing key on {}", tsk); + return Err(anyhow::anyhow!("Found no suitable signing key on {}", tsk)); } } @@ -55,29 +58,31 @@ fn main() { // packet structure we want. First, we want the output to be // ASCII armored. let mut sink = armor::Writer::new(io::stdout(), armor::Kind::Signature) - .expect("Failed to create armored writer."); + .context("Failed to create armored writer.")?; // Stream an OpenPGP message. let message = Message::new(&mut sink); // Now, create a signer that emits the detached signature(s). let mut signer = - Signer::new(message, keys.pop().expect("No key for signing")); + Signer::new(message, keys.pop().context("No key for signing")?); for s in keys { signer = signer.add_signer(s); } let mut signer = - signer.detached().build().expect("Failed to create signer"); + signer.detached().build().context("Failed to create signer")?; // Copy all the data. io::copy(&mut io::stdin(), &mut signer) - .expect("Failed to sign data"); + .context("Failed to sign data")?; // Finally, teardown the stack to ensure all the data is written. signer.finalize() - .expect("Failed to write data"); + .context("Failed to write data")?; // Finalize the armor writer. sink.finalize() - .expect("Failed to write data"); + .context("Failed to write data")?; + + Ok(()) } |