openpgp: Drop openpgp::Reader.

  - Now that the packet parser transparently strips armor, this reader
    is no longer necessary.

3 files changed, 22 insertions, 48 deletions

diff --git a/tool/src/commands/mod.rs b/tool/src/commands/mod.rs
index 8bc233ea..a92b84ef 100644
--- a/tool/src/commands/mod.rs
+++ b/tool/src/commands/mod.rs
@@ -112,9 +112,8 @@ fn sign_data(input: &mut io::Read, output_path: Option<&str>,
         if detached && append && output_path.is_some() {
             // First, read the existing signatures.
             let mut sigs = Vec::new();
-            let reader = openpgp::Reader::from_file(output_path.unwrap())?;
-            let mut ppr
-                = openpgp::parse::PacketParser::from_reader(reader)?;
+            let mut ppr =
+                openpgp::parse::PacketParser::from_file(output_path.unwrap())?;
 
             while let PacketParserResult::Some(mut pp) = ppr {
                 let (packet, ppr_tmp) = pp.recurse()?;
@@ -213,9 +212,7 @@ fn sign_message(input: &mut io::Read, output_path: Option<&str>,
 
     // Create a parser for the message to be notarized.
     let mut ppr
-        = openpgp::parse::PacketParser::from_reader(
-            openpgp::Reader::from_reader(input)
-                .context("Failed to build reader")?)
+        = openpgp::parse::PacketParser::from_reader(input)
         .context("Failed to build parser")?;
 
     // Once we see a signature, we can no longer strip compression.
diff --git a/tool/src/sq.rs b/tool/src/sq.rs
index 4b229fe6..0720b5a1 100644
--- a/tool/src/sq.rs
+++ b/tool/src/sq.rs
@@ -51,11 +51,7 @@ fn load_tpks<'a, I>(files: I) -> openpgp::Result<Vec<TPK>>
 {
     let mut tpks = vec![];
     for f in files {
-        tpks.push(TPK::from_reader(
-            // Use an openpgp::Reader so that we accept both armored
-            // and plain PGP data.
-            openpgp::Reader::from_file(f)
-                .context(format!("Failed to open key file {:?}", f))?)
+        tpks.push(TPK::from_file(f)
                   .context(format!("Failed to load key from file {:?}", f))?);
     }
     Ok(tpks)
@@ -99,9 +95,8 @@ fn real_main() -> Result<(), failure::Error> {
 
     match matches.subcommand() {
         ("decrypt",  Some(m)) => {
-            let input = open_or_stdin(m.value_of("input"))?;
+            let mut input = open_or_stdin(m.value_of("input"))?;
             let mut output = create_or_stdout(m.value_of("output"))?;
-            let mut input = openpgp::Reader::from_reader(input)?;
             let signatures: usize =
                 m.value_of("signatures").unwrap_or("0").parse()?;
             let tpks = m.values_of("public-key-file")
@@ -210,14 +205,13 @@ fn real_main() -> Result<(), failure::Error> {
         },
 
         ("dump",  Some(m)) => {
-            let input = open_or_stdin(m.value_of("input"))?;
+            let mut input = open_or_stdin(m.value_of("input"))?;
             let mut output = create_or_stdout(m.value_of("output"))?;
-            let mut input = openpgp::Reader::from_reader(input)?;
             commands::dump(&mut input, &mut output,
                            m.is_present("mpis"), m.is_present("hex"))?;
         },
         ("split",  Some(m)) => {
-            let input = open_or_stdin(m.value_of("input"))?;
+            let mut input = open_or_stdin(m.value_of("input"))?;
             let prefix =
                 // The prefix is either specified explicitly...
                 m.value_of("prefix").map(|p| p.to_owned())
@@ -232,7 +226,6 @@ fn real_main() -> Result<(), failure::Error> {
                         .unwrap_or(String::from("output"))
                     // ... finally, add a hyphen to the derived prefix.
                         + "-");
-            let mut input = openpgp::Reader::from_reader(input)?;
             commands::split(&mut input, &prefix)?;
         },
         ("keyserver",  Some(m)) => {
@@ -269,9 +262,7 @@ fn real_main() -> Result<(), failure::Error> {
                         .context("Failed to serialize key")?;
                 },
                 ("send",  Some(m)) => {
-                    let input = open_or_stdin(m.value_of("input"))?;
-                    let mut input = openpgp::Reader::from_reader(input)?;
-
+                    let mut input = open_or_stdin(m.value_of("input"))?;
                     let tpk = TPK::from_reader(&mut input).
                         context("Malformed key")?;
 
@@ -300,9 +291,7 @@ fn real_main() -> Result<(), failure::Error> {
                 ("import",  Some(m)) => {
                     let label = m.value_of("label").unwrap();
                     help_warning(label);
-                    let input = open_or_stdin(m.value_of("input"))?;
-                    let mut input = openpgp::Reader::from_reader(input)?;
-
+                    let mut input = open_or_stdin(m.value_of("input"))?;
                     let tpk = TPK::from_reader(&mut input)?;
                     store.import(label, &tpk)?;
                 },
diff --git a/tool/tests/sq-sign.rs b/tool/tests/sq-sign.rs
index 0089a9a8..696f662e 100644
--- a/tool/tests/sq-sign.rs
+++ b/tool/tests/sq-sign.rs
@@ -7,7 +7,7 @@ extern crate tempfile;
 use tempfile::TempDir;
 
 extern crate sequoia_openpgp as openpgp;
-use openpgp::{Packet, PacketPile, Reader, TPK};
+use openpgp::{Packet, PacketPile, TPK};
 use openpgp::constants::{CompressionAlgorithm, DataFormat, SignatureType};
 use openpgp::serialize::stream::{Message, Signer, Compressor, LiteralWriter};
 
@@ -35,8 +35,7 @@ fn sq_sign() {
 
     // Check that the content is sane.
     let packets: Vec<Packet> =
-        PacketPile::from_reader(Reader::from_file(&sig).unwrap())
-        .unwrap().into_children().collect();
+        PacketPile::from_file(&sig).unwrap().into_children().collect();
     assert_eq!(packets.len(), 3);
     if let Packet::OnePassSig(ref ops) = packets[0] {
         assert!(ops.last());
@@ -90,8 +89,7 @@ fn sq_sign_append() {
 
     // Check that the content is sane.
     let packets: Vec<Packet> =
-        PacketPile::from_reader(Reader::from_file(&sig0).unwrap())
-        .unwrap().into_children().collect();
+        PacketPile::from_file(&sig0).unwrap().into_children().collect();
     assert_eq!(packets.len(), 3);
     if let Packet::OnePassSig(ref ops) = packets[0] {
         assert!(ops.last());
@@ -141,8 +139,7 @@ fn sq_sign_append() {
 
     // Check that the content is sane.
     let packets: Vec<Packet> =
-        PacketPile::from_reader(Reader::from_file(&sig1).unwrap())
-        .unwrap().into_children().collect();
+        PacketPile::from_file(&sig1).unwrap().into_children().collect();
     assert_eq!(packets.len(), 5);
     if let Packet::OnePassSig(ref ops) = packets[0] {
         assert!(! ops.last());
@@ -225,8 +222,7 @@ fn sq_sign_append_on_compress_then_sign() {
 
     // Check that the content is sane.
     let packets: Vec<Packet> =
-        PacketPile::from_reader(Reader::from_file(&sig0).unwrap())
-        .unwrap().into_children().collect();
+        PacketPile::from_file(&sig0).unwrap().into_children().collect();
     assert_eq!(packets.len(), 3);
     if let Packet::OnePassSig(ref ops) = packets[0] {
         assert!(ops.last());
@@ -277,8 +273,7 @@ fn sq_sign_append_on_compress_then_sign() {
 
     // Check that the content is sane.
     let packets: Vec<Packet> =
-        PacketPile::from_reader(Reader::from_file(&sig1).unwrap())
-        .unwrap().into_children().collect();
+        PacketPile::from_file(&sig1).unwrap().into_children().collect();
     assert_eq!(packets.len(), 5);
     if let Packet::OnePassSig(ref ops) = packets[0] {
         assert!(! ops.last());
@@ -355,8 +350,7 @@ fn sq_sign_detached() {
 
     // Check that the content is sane.
     let packets: Vec<Packet> =
-        PacketPile::from_reader(Reader::from_file(&sig).unwrap())
-        .unwrap().into_children().collect();
+        PacketPile::from_file(&sig).unwrap().into_children().collect();
     assert_eq!(packets.len(), 1);
     if let Packet::Signature(ref sig) = packets[0] {
         assert_eq!(sig.sigtype(), SignatureType::Binary);
@@ -400,8 +394,7 @@ fn sq_sign_detached_append() {
 
     // Check that the content is sane.
     let packets: Vec<Packet> =
-        PacketPile::from_reader(Reader::from_file(&sig).unwrap())
-        .unwrap().into_children().collect();
+        PacketPile::from_file(&sig).unwrap().into_children().collect();
     assert_eq!(packets.len(), 1);
     if let Packet::Signature(ref sig) = packets[0] {
         assert_eq!(sig.sigtype(), SignatureType::Binary);
@@ -455,8 +448,7 @@ fn sq_sign_detached_append() {
 
     // Check that the content is sane.
     let packets: Vec<Packet> =
-        PacketPile::from_reader(Reader::from_file(&sig).unwrap())
-        .unwrap().into_children().collect();
+        PacketPile::from_file(&sig).unwrap().into_children().collect();
     assert_eq!(packets.len(), 2);
     if let Packet::Signature(ref sig) = packets[0] {
         assert_eq!(sig.sigtype(), SignatureType::Binary);
@@ -510,8 +502,7 @@ fn sq_sign_detached_append() {
 
     // Check that the content is still sane.
     let packets: Vec<Packet> =
-        PacketPile::from_reader(Reader::from_file(&sig).unwrap())
-        .unwrap().into_children().collect();
+        PacketPile::from_file(&sig).unwrap().into_children().collect();
     assert_eq!(packets.len(), 2);
     if let Packet::Signature(ref sig) = packets[0] {
         assert_eq!(sig.sigtype(), SignatureType::Binary);
@@ -548,8 +539,7 @@ fn sq_sign_append_a_notarization() {
 
     // Check that the content is sane.
     let packets: Vec<Packet> =
-        PacketPile::from_reader(Reader::from_file(&sig0).unwrap())
-        .unwrap().into_children().collect();
+        PacketPile::from_file(&sig0).unwrap().into_children().collect();
     assert_eq!(packets.len(), 7);
     if let Packet::OnePassSig(ref ops) = packets[0] {
         assert!(! ops.last());
@@ -647,8 +637,7 @@ fn sq_sign_notarize() {
 
     // Check that the content is sane.
     let packets: Vec<Packet> =
-        PacketPile::from_reader(Reader::from_file(&sig0).unwrap())
-        .unwrap().into_children().collect();
+        PacketPile::from_file(&sig0).unwrap().into_children().collect();
     assert_eq!(packets.len(), 5);
     if let Packet::OnePassSig(ref ops) = packets[0] {
         assert!(ops.last());
@@ -725,8 +714,7 @@ fn sq_sign_notarize_a_notarization() {
 
     // Check that the content is sane.
     let packets: Vec<Packet> =
-        PacketPile::from_reader(Reader::from_file(&sig0).unwrap())
-        .unwrap().into_children().collect();
+        PacketPile::from_file(&sig0).unwrap().into_children().collect();
     assert_eq!(packets.len(), 7);
     if let Packet::OnePassSig(ref ops) = packets[0] {
         assert!(ops.last());