diff options
| author | Justus Winter <justus@sequoia-pgp.org> | 2020-02-12 13:36:22 +0100 |
|---|---|---|
| committer | Justus Winter <justus@sequoia-pgp.org> | 2020-02-12 15:12:21 +0100 |
| commit | a6ff2539d4fcb569eba07c38d3ca992c266bdc57 (patch) | |
| tree | 2cebe3adf218412f900e84713e55f2b0c5bfdbd4 /openpgp-ffi | |
| parent | b0648d984bc618686a18d5e0a5173c16b2328549 (diff) | |
openpgp: Add optional cipher argument to DecryptionHelper::decrypt.
Diffstat (limited to 'openpgp-ffi')
| -rw-r--r-- | openpgp-ffi/include/sequoia/openpgp/types.h | 1 | ||||
| -rw-r--r-- | openpgp-ffi/src/parse/stream.rs | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/openpgp-ffi/include/sequoia/openpgp/types.h b/openpgp-ffi/include/sequoia/openpgp/types.h index e99413d0..46deb520 100644 --- a/openpgp-ffi/include/sequoia/openpgp/types.h +++ b/openpgp-ffi/include/sequoia/openpgp/types.h @@ -510,6 +510,7 @@ typedef pgp_status_t (pgp_decryptor_do_decrypt_cb_t) ( typedef pgp_status_t (*pgp_decryptor_decrypt_cb_t) (void *, pgp_pkesk_t *, size_t, pgp_skesk_t *, size_t, + uint8_t, /* XXX: SymmetricAlgorithm */ pgp_decryptor_do_decrypt_cb_t *, void *, pgp_fingerprint_t *); diff --git a/openpgp-ffi/src/parse/stream.rs b/openpgp-ffi/src/parse/stream.rs index 0fb0bec9..5c9c92a3 100644 --- a/openpgp-ffi/src/parse/stream.rs +++ b/openpgp-ffi/src/parse/stream.rs @@ -335,6 +335,7 @@ type InspectCallback = fn(*mut HelperCookie, *const PacketParser) -> Status; type DecryptCallback = fn(*mut HelperCookie, *const *const PKESK, usize, *const *const SKESK, usize, + u8, // XXX SymmetricAlgorithm extern "C" fn (*mut c_void, u8, *const crypto::SessionKey) -> Status, @@ -733,6 +734,7 @@ impl DecryptionHelper for DHelper { } fn decrypt<D>(&mut self, pkesks: &[PKESK], skesks: &[SKESK], + sym_algo: Option<SymmetricAlgorithm>, mut decrypt: D) -> openpgp::Result<Option<openpgp::Fingerprint>> where D: FnMut(SymmetricAlgorithm, &SessionKey) -> openpgp::Result<()> @@ -769,6 +771,7 @@ impl DecryptionHelper for DHelper { let result = (self.decrypt_cb)( self.vhelper.cookie, pkesks.as_ptr(), pkesks.len(), skesks.as_ptr(), skesks.len(), + sym_algo.map(|s| u8::from(s)).unwrap_or(0), trampoline::<D>, &mut decrypt as *mut _ as *mut c_void, &mut identity); @@ -847,6 +850,7 @@ impl DecryptionHelper for DHelper { /// decrypt_cb (void *cookie_opaque, /// pgp_pkesk_t *pkesks, size_t pkesk_count, /// pgp_skesk_t *skesks, size_t skesk_count, +/// uint8_t sym_algo_hint, /// pgp_decryptor_do_decrypt_cb_t *decrypt, /// void *decrypt_cookie, /// pgp_fingerprint_t *identity_out) |