summaryrefslogtreecommitdiffstats
path: root/openpgp-ffi/src/serialize.rs
diff options
context:
space:
mode:
authorJustus Winter <justus@sequoia-pgp.org>2019-03-18 14:04:23 +0100
committerJustus Winter <justus@sequoia-pgp.org>2019-03-18 14:47:44 +0100
commit97cdc3062d88401dcc849c3f4e093a4f7b1b1226 (patch)
tree0859e06007b25e9cabbf4e9bfd7a2487ea2e8585 /openpgp-ffi/src/serialize.rs
parent01db33b99244294702f0f58f06c6736becee28db (diff)
openpgp: Make cipher algorithm configurable in streaming Encryptor.
- Fixes #208.
Diffstat (limited to 'openpgp-ffi/src/serialize.rs')
-rw-r--r--openpgp-ffi/src/serialize.rs10
1 files changed, 6 insertions, 4 deletions
diff --git a/openpgp-ffi/src/serialize.rs b/openpgp-ffi/src/serialize.rs
index 61e69a98..f39a069d 100644
--- a/openpgp-ffi/src/serialize.rs
+++ b/openpgp-ffi/src/serialize.rs
@@ -221,7 +221,8 @@ pub extern "system" fn pgp_encryptor_new
inner: *mut writer::Stack<'static, Cookie>,
passwords: Option<&*const c_char>, passwords_len: size_t,
recipients: Option<&*const TPK>, recipients_len: size_t,
- encryption_mode: uint8_t)
+ encryption_mode: uint8_t,
+ cipher_algo: uint8_t)
-> *mut writer::Stack<'static, Cookie>
{
ffi_make_fry_from_errp!(errp);
@@ -253,7 +254,8 @@ pub extern "system" fn pgp_encryptor_new
_ => panic!("Bad encryption mode: {}", encryption_mode),
};
ffi_try_box!(Encryptor::new(*inner,
- &passwords_.iter().collect::<Vec<&Password>>(),
- &recipients[..],
- encryption_mode))
+ &passwords_.iter().collect::<Vec<&Password>>(),
+ &recipients[..],
+ encryption_mode,
+ Some(cipher_algo.into())))
}