summaryrefslogtreecommitdiffstats
path: root/openpgp/src/serialize/stream.rs
diff options
context:
space:
mode:
authorJustus Winter <justus@sequoia-pgp.org>2020-02-12 13:36:22 +0100
committerJustus Winter <justus@sequoia-pgp.org>2020-02-12 15:12:21 +0100
commita6ff2539d4fcb569eba07c38d3ca992c266bdc57 (patch)
tree2cebe3adf218412f900e84713e55f2b0c5bfdbd4 /openpgp/src/serialize/stream.rs
parentb0648d984bc618686a18d5e0a5173c16b2328549 (diff)
openpgp: Add optional cipher argument to DecryptionHelper::decrypt.
Diffstat (limited to 'openpgp/src/serialize/stream.rs')
-rw-r--r--openpgp/src/serialize/stream.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/openpgp/src/serialize/stream.rs b/openpgp/src/serialize/stream.rs
index f8d3ed4b..961298b9 100644
--- a/openpgp/src/serialize/stream.rs
+++ b/openpgp/src/serialize/stream.rs
@@ -1699,6 +1699,7 @@ mod test {
}
impl<'a> DecryptionHelper for Helper<'a> {
fn decrypt<D>(&mut self, pkesks: &[PKESK], _skesks: &[SKESK],
+ sym_algo: Option<SymmetricAlgorithm>,
mut decrypt: D) -> Result<Option<crate::Fingerprint>>
where D: FnMut(SymmetricAlgorithm, &SessionKey) -> Result<()>
{
@@ -1707,7 +1708,7 @@ mod test {
.map(|ka| ka.key()).next().unwrap()
.clone().mark_parts_secret().unwrap()
.into_keypair().unwrap();
- pkesks[0].decrypt(&mut keypair, None)
+ pkesks[0].decrypt(&mut keypair, sym_algo)
.and_then(|(algo, session_key)| decrypt(algo, &session_key))
.map(|_| None)
}