From 499372f18785a884dc819c03fa5d24ecd229211f Mon Sep 17 00:00:00 2001 From: Wiktor Kwapisiewicz Date: Thu, 17 Sep 2020 10:19:55 +0200 Subject: openpgp: Hide stream::Encryptor::aead_algo from public API. - Mark `aead_algo` as available only during tests, - Remove support for AEAD from `sop`, - Mark `aead` parameter in FFI as unused, - openpgp-ffi: Drop `aead_algo` argument from `pgp_encryptor_new`, - Fixes #550. --- sop/src/main.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'sop') diff --git a/sop/src/main.rs b/sop/src/main.rs index 15eccf4c..37f28d06 100644 --- a/sop/src/main.rs +++ b/sop/src/main.rs @@ -300,14 +300,12 @@ fn real_main() -> Result<()> { let message = stdout(no_armor, armor::Kind::Message)?; // Encrypt the message. - let mut encryptor = + let encryptor = Encryptor::for_recipients(message, recipients) .add_passwords(passwords) .symmetric_algo( symmetric_algos.get(0).cloned().unwrap_or_default()); - if let Some(&a) = aead_algos.get(0) { - encryptor = encryptor.aead_algo(a); - } + let message = encryptor.build() .context("Failed to create encryptor")?; -- cgit v1.2.3