diff options
| author | Justus Winter <justus@sequoia-pgp.org> | 2019-12-05 16:13:54 +0100 |
|---|---|---|
| committer | Justus Winter <justus@sequoia-pgp.org> | 2019-12-05 16:21:52 +0100 |
| commit | 41fd3f08adff856ec558f8b06214e0f392893a26 (patch) | |
| tree | e7894d4e77074109692503fab3b3b46d343f70b6 /tool | |
| parent | 71a3a540bda400f52a841c04b8d33a51959fa8f0 (diff) | |
openpgp: Make crypto::{Signer,Decryptor} non-polymorphic.
- These are low-level cryptographic traits that are not concerned
with the role of a key.
- Fixes #382.
Diffstat (limited to 'tool')
| -rw-r--r-- | tool/src/commands/decrypt.rs | 2 | ||||
| -rw-r--r-- | tool/src/commands/mod.rs | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/tool/src/commands/decrypt.rs b/tool/src/commands/decrypt.rs index f872a84f..f04b6ac1 100644 --- a/tool/src/commands/decrypt.rs +++ b/tool/src/commands/decrypt.rs @@ -96,7 +96,7 @@ impl<'a> Helper<'a> { /// Tries to decrypt the given PKESK packet with `keypair` and try /// to decrypt the packet parser using `decrypt`. fn try_decrypt<D>(&self, pkesk: &PKESK, - keypair: &mut dyn crypto::Decryptor<key::UnspecifiedRole>, + keypair: &mut dyn crypto::Decryptor, decrypt: &mut D) -> openpgp::Result<Option<Fingerprint>> where D: FnMut(SymmetricAlgorithm, &SessionKey) -> openpgp::Result<()> diff --git a/tool/src/commands/mod.rs b/tool/src/commands/mod.rs index b4350dfb..37254db2 100644 --- a/tool/src/commands/mod.rs +++ b/tool/src/commands/mod.rs @@ -44,8 +44,7 @@ pub mod key; /// Returns suitable signing keys from a given list of Certs. fn get_signing_keys(certs: &[openpgp::Cert]) - -> Result<Vec<crypto::KeyPair< - openpgp::packet::key::UnspecifiedRole>>> + -> Result<Vec<crypto::KeyPair>> { let mut keys = Vec::new(); 'next_cert: for tsk in certs { |