summaryrefslogtreecommitdiffstats
path: root/tool
diff options
context:
space:
mode:
authorJustus Winter <justus@sequoia-pgp.org>2019-12-18 14:44:53 +0100
committerJustus Winter <justus@sequoia-pgp.org>2019-12-18 16:21:46 +0100
commit7a6701001a9408a8eae6faedc91b5d2c42611c5c (patch)
tree21c0080676d791996043ddc133e0fa96879c144e /tool
parent1e19e63f9a717df2c3dbb50b18665844e64cef9a (diff)
openpgp: Make type aliases for keys pub(crate).
- They can still be used as a convenience, but the documentation will refer to them as their expanded counterparts. - This makes the structure of they Key<_, _> type more visible.
Diffstat (limited to 'tool')
-rw-r--r--tool/src/commands/decrypt.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/tool/src/commands/decrypt.rs b/tool/src/commands/decrypt.rs
index 4186a9f7..2ab0f32c 100644
--- a/tool/src/commands/decrypt.rs
+++ b/tool/src/commands/decrypt.rs
@@ -27,7 +27,7 @@ use super::{dump::PacketDumper, VHelper};
struct Helper<'a> {
vhelper: VHelper<'a>,
secret_keys:
- HashMap<KeyID, key::UnspecifiedSecret>,
+ HashMap<KeyID, Key<key::SecretParts, key::UnspecifiedRole>>,
key_identities: HashMap<KeyID, Fingerprint>,
key_hints: HashMap<KeyID, String>,
dump_session_key: bool,
@@ -40,8 +40,7 @@ impl<'a> Helper<'a> {
signatures: usize, certs: Vec<Cert>, secrets: Vec<Cert>,
dump_session_key: bool, dump: bool, hex: bool)
-> Self {
- let mut keys: HashMap<KeyID, key::UnspecifiedSecret>
- = HashMap::new();
+ let mut keys = HashMap::new();
let mut identities: HashMap<KeyID, Fingerprint> = HashMap::new();
let mut hints: HashMap<KeyID, String> = HashMap::new();
for tsk in secrets {