diff options
Diffstat (limited to 'tool/src/commands/decrypt.rs')
-rw-r--r-- | tool/src/commands/decrypt.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tool/src/commands/decrypt.rs b/tool/src/commands/decrypt.rs index 33725290..a30d6d6f 100644 --- a/tool/src/commands/decrypt.rs +++ b/tool/src/commands/decrypt.rs @@ -9,7 +9,7 @@ use sequoia_core::Context; use crate::openpgp::types::SymmetricAlgorithm; use crate::openpgp::conversions::hex; use crate::openpgp::crypto::{self, SessionKey}; -use crate::openpgp::{Fingerprint, TPK, KeyID, Result}; +use crate::openpgp::{Fingerprint, Cert, KeyID, Result}; use crate::openpgp::packet::prelude::*; use crate::openpgp::parse::PacketParser; use crate::openpgp::parse::stream::{ @@ -32,7 +32,7 @@ struct Helper<'a> { impl<'a> Helper<'a> { fn new(ctx: &'a Context, mapping: &'a mut store::Mapping, - signatures: usize, tpks: Vec<TPK>, secrets: Vec<TPK>, + signatures: usize, certs: Vec<Cert>, secrets: Vec<Cert>, dump_session_key: bool, dump: bool, hex: bool) -> Self { let mut keys: HashMap<KeyID, key::UnspecifiedSecret> @@ -77,7 +77,7 @@ impl<'a> Helper<'a> { } Helper { - vhelper: VHelper::new(ctx, mapping, signatures, tpks), + vhelper: VHelper::new(ctx, mapping, signatures, certs), secret_keys: keys, key_identities: identities, key_hints: hints, @@ -123,7 +123,7 @@ impl<'a> Helper<'a> { } impl<'a> VerificationHelper for Helper<'a> { - fn get_public_keys(&mut self, ids: &[openpgp::KeyHandle]) -> Result<Vec<TPK>> { + fn get_public_keys(&mut self, ids: &[openpgp::KeyHandle]) -> Result<Vec<Cert>> { self.vhelper.get_public_keys(ids) } fn check(&mut self, structure: &MessageStructure) -> Result<()> { @@ -294,11 +294,11 @@ impl<'a> DecryptionHelper for Helper<'a> { pub fn decrypt(ctx: &Context, mapping: &mut store::Mapping, input: &mut dyn io::Read, output: &mut dyn io::Write, - signatures: usize, tpks: Vec<TPK>, secrets: Vec<TPK>, + signatures: usize, certs: Vec<Cert>, secrets: Vec<Cert>, dump_session_key: bool, dump: bool, hex: bool) -> Result<()> { - let helper = Helper::new(ctx, mapping, signatures, tpks, secrets, + let helper = Helper::new(ctx, mapping, signatures, certs, secrets, dump_session_key, dump, hex); let mut decryptor = Decryptor::from_reader(input, helper, None) .context("Decryption failed")?; |