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.

1 files changed, 1 insertions, 11 deletions

diff --git a/openpgp-ffi/src/serialize.rs b/openpgp-ffi/src/serialize.rs
index 20ccc684..972ce7a5 100644
--- a/openpgp-ffi/src/serialize.rs
+++ b/openpgp-ffi/src/serialize.rs
@@ -13,7 +13,6 @@ use libc::{c_char, size_t, ssize_t};
 extern crate sequoia_openpgp as openpgp;
 
 use self::openpgp::types::{
-    AEADAlgorithm,
     SymmetricAlgorithm,
 };
 
@@ -352,8 +351,7 @@ pub extern "C" fn pgp_encryptor_new<'a>
      inner: *mut Message<'a>,
      passwords: Option<&*const c_char>, passwords_len: size_t,
      recipients: Option<&*mut Recipient<'a>>, recipients_len: size_t,
-     cipher_algo: u8,
-     aead_algo: u8)
+     cipher_algo: u8)
      -> *mut Message<'a>
 {
     ffi_make_fry_from_errp!(errp);
@@ -384,11 +382,6 @@ pub extern "C" fn pgp_encryptor_new<'a>
     } else {
         Some(cipher_algo.into())
     };
-    let aead_algo : Option<AEADAlgorithm> = if aead_algo == 0 {
-        None
-    } else {
-        Some(aead_algo.into())
-    };
     if passwords_.len() + recipients_.len() == 0 {
         ffi_try!(Err(anyhow::anyhow!(
             "Neither recipient nor password given")));
@@ -399,8 +392,5 @@ pub extern "C" fn pgp_encryptor_new<'a>
     if let Some(algo) = cipher_algo {
         encryptor = encryptor.symmetric_algo(algo);
     }
-    if let Some(algo) = aead_algo {
-        encryptor = encryptor.aead_algo(algo);
-    }
     ffi_try_box!(encryptor.build())
 }