From b1abf63f5a4f446b187f80b5f48be1e7f3021386 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Wed, 5 Dec 2018 14:15:10 +0100 Subject: openpgp: Drop openpgp::Reader. - Now that the packet parser transparently strips armor, this reader is no longer necessary. --- sqv/src/sqv.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'sqv/src') diff --git a/sqv/src/sqv.rs b/sqv/src/sqv.rs index 567f6427..963fcf1b 100644 --- a/sqv/src/sqv.rs +++ b/sqv/src/sqv.rs @@ -66,8 +66,7 @@ fn real_main() -> Result<(), failure::Error> { // .unwrap() is safe, because "sig-file" is required. let sig_file = matches.value_of_os("sig-file").unwrap(); - let mut ppr = PacketParser::from_reader( - openpgp::Reader::from_file(sig_file)?)?; + let mut ppr = PacketParser::from_file(sig_file)?; let mut sigs_seen = HashSet::new(); let mut sigs : Vec<(Signature, KeyID, Option)> = Vec::new(); @@ -161,8 +160,7 @@ fn real_main() -> Result<(), failure::Error> { .expect("No keyring specified.") { // Load the keyring. - let tpks : Vec = TPKParser::from_reader( - openpgp::Reader::from_file(filename)?)? + let tpks : Vec = TPKParser::from_file(filename)? .unvalidated_tpk_filter(|tpk, _| { for &(_, ref issuer, _) in &sigs { if tpk_has_key(tpk, issuer) { -- cgit v1.2.3