diff options
author | Justus Winter <justus@sequoia-pgp.org> | 2019-09-17 17:15:58 +0200 |
---|---|---|
committer | Justus Winter <justus@sequoia-pgp.org> | 2019-09-18 10:14:15 +0200 |
commit | 702d7c5dc4dfff8bb591bc87f33c968bb52cd33c (patch) | |
tree | 5a3b94b47209fff400fff4b0b3c6ad5b4856abb3 /tool/src/commands/decrypt.rs | |
parent | f356ef30a2ccfee2b63db8b9439d5b1898f97d9a (diff) |
store: Rename store::Store to Mapping.
- Fixes #88.
Diffstat (limited to 'tool/src/commands/decrypt.rs')
-rw-r--r-- | tool/src/commands/decrypt.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tool/src/commands/decrypt.rs b/tool/src/commands/decrypt.rs index 9906b583..bde80c2b 100644 --- a/tool/src/commands/decrypt.rs +++ b/tool/src/commands/decrypt.rs @@ -31,7 +31,7 @@ struct Helper<'a> { } impl<'a> Helper<'a> { - fn new(ctx: &'a Context, store: &'a mut store::Store, + fn new(ctx: &'a Context, mapping: &'a mut store::Mapping, signatures: usize, tpks: Vec<TPK>, secrets: Vec<TPK>, dump_session_key: bool, dump: bool, hex: bool) -> Self { @@ -77,7 +77,7 @@ impl<'a> Helper<'a> { } Helper { - vhelper: VHelper::new(ctx, store, signatures, tpks), + vhelper: VHelper::new(ctx, mapping, signatures, tpks), secret_keys: keys, key_identities: identities, key_hints: hints, @@ -292,13 +292,13 @@ impl<'a> DecryptionHelper for Helper<'a> { } } -pub fn decrypt(ctx: &Context, store: &mut store::Store, +pub fn decrypt(ctx: &Context, mapping: &mut store::Mapping, input: &mut io::Read, output: &mut io::Write, signatures: usize, tpks: Vec<TPK>, secrets: Vec<TPK>, dump_session_key: bool, dump: bool, hex: bool) -> Result<()> { - let helper = Helper::new(ctx, store, signatures, tpks, secrets, + let helper = Helper::new(ctx, mapping, signatures, tpks, secrets, dump_session_key, dump, hex); let mut decryptor = Decryptor::from_reader(input, helper, None) .context("Decryption failed")?; |