From a9ca727cab50c0c91098a7ef8aea79f5f62a1f5c Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Fri, 3 Apr 2020 18:22:55 +0200 Subject: openpgp: Unawkwardify the streaming encryptor. --- tool/src/commands/mod.rs | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'tool/src') 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")?; -- cgit v1.2.3