diff options
author | Justus Winter <justus@sequoia-pgp.org> | 2020-05-07 15:36:37 +0200 |
---|---|---|
committer | Justus Winter <justus@sequoia-pgp.org> | 2020-05-07 17:00:52 +0200 |
commit | 3eb554d0980ae788df2a07df609b77e01b7e57ce (patch) | |
tree | 1a36348c4e7dd5ec7b3f83b6ed5d93b80a0e200d /tool/src | |
parent | 50b3ed9a61161761f20d134b13c2f8ac07698ea5 (diff) |
openpgp: Use a builder to construct Decryptor.
- See #498.
Diffstat (limited to 'tool/src')
-rw-r--r-- | tool/src/commands/decrypt.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tool/src/commands/decrypt.rs b/tool/src/commands/decrypt.rs index 8a1a0f78..1b228a7f 100644 --- a/tool/src/commands/decrypt.rs +++ b/tool/src/commands/decrypt.rs @@ -18,7 +18,7 @@ use crate::openpgp::parse::{ PacketParserResult, }; use crate::openpgp::parse::stream::{ - VerificationHelper, DecryptionHelper, Decryptor, MessageStructure, + VerificationHelper, DecryptionHelper, DecryptorBuilder, MessageStructure, }; use crate::openpgp::policy::Policy; extern crate sequoia_store as store; @@ -288,7 +288,8 @@ pub fn decrypt(ctx: &Context, policy: &dyn Policy, mapping: &mut store::Mapping, -> Result<()> { let helper = Helper::new(ctx, policy, mapping, signatures, certs, secrets, dump_session_key, dump, hex); - let mut decryptor = Decryptor::from_reader(policy, input, helper, None) + let mut decryptor = DecryptorBuilder::from_reader(input)? + .with_policy(policy, None, helper) .context("Decryption failed")?; io::copy(&mut decryptor, output).context("Decryption failed")?; |