diff options
| author | Wiktor Kwapisiewicz <wiktor@metacode.biz> | 2020-09-17 10:19:55 +0200 |
|---|---|---|
| committer | Wiktor Kwapisiewicz <wiktor@metacode.biz> | 2020-09-22 09:32:09 +0200 |
| commit | 499372f18785a884dc819c03fa5d24ecd229211f (patch) | |
| tree | 33b4ac0d0d196244bbc8a681029a8da9358f1ed8 /openpgp-ffi | |
| parent | 6c12cbcf9d1396ec8028ea3f17430e3d20c3c89f (diff) | |
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.
Diffstat (limited to 'openpgp-ffi')
| -rw-r--r-- | openpgp-ffi/examples/encrypt-for.c | 3 | ||||
| -rw-r--r-- | openpgp-ffi/include/sequoia/openpgp.h | 3 | ||||
| -rw-r--r-- | openpgp-ffi/src/serialize.rs | 12 |
3 files changed, 3 insertions, 15 deletions
diff --git a/openpgp-ffi/examples/encrypt-for.c b/openpgp-ffi/examples/encrypt-for.c index 27a7a585..c7f2841f 100644 --- a/openpgp-ffi/examples/encrypt-for.c +++ b/openpgp-ffi/examples/encrypt-for.c @@ -57,8 +57,7 @@ main (int argc, char **argv) writer, NULL, 0, /* no passwords */ recipients, recipients_len, - 9 /* AES256 */, - 0 /* No AEAD */); + 9 /* AES256 */); if (writer == NULL) error (1, 0, "pgp_encryptor_new: %s", pgp_error_to_string (err)); diff --git a/openpgp-ffi/include/sequoia/openpgp.h b/openpgp-ffi/include/sequoia/openpgp.h index 074170d5..a5c49596 100644 --- a/openpgp-ffi/include/sequoia/openpgp.h +++ b/openpgp-ffi/include/sequoia/openpgp.h @@ -1842,8 +1842,7 @@ pgp_writer_stack_t pgp_encryptor_new (pgp_error_t *errp, size_t passwords_len, pgp_recipient_t *recipients, size_t recipients_len, - uint8_t cipher_algo, - uint8_t aead_algo); + uint8_t cipher_algo); /*/ /// Frees this object. 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()) } |