openpgp: Unawkwardify the streaming encryptor.

1 files changed, 2 insertions, 8 deletions

diff --git a/tool/src/commands/mod.rs b/tool/src/commands/mod.rs
index 1cc6651b..67e6b830 100644
--- a/tool/src/commands/mod.rs
+++ b/tool/src/commands/mod.rs
@@ -137,17 +137,11 @@ pub fn encrypt(policy: &dyn Policy,
     let message = Message::new(output);
 
     // We want to encrypt a literal data packet.
-    let mut encryptor = if let Some(p) = passwords.pop() {
-        Encryptor::with_password(message, p)
-    } else {
-        Encryptor::for_recipient(message, recipient_subkeys.pop().unwrap())
-    };
+    let mut encryptor =
+        Encryptor::for_recipients(message, recipient_subkeys);
     for p in passwords {
         encryptor = encryptor.add_password(p);
     }
-    for r in recipient_subkeys {
-        encryptor = encryptor.add_recipient(r);
-    }
 
     let mut sink = encryptor.build()
         .context("Failed to create encryptor")?;