diff options
| author | Justus Winter <justus@sequoia-pgp.org> | 2019-11-26 13:04:47 +0100 |
|---|---|---|
| committer | Justus Winter <justus@sequoia-pgp.org> | 2019-11-26 14:29:29 +0100 |
| commit | b24d1c5a099e2c741cf724816d49b8dd7977e049 (patch) | |
| tree | 0288feb61d74b61acc39045a5e2b31551eb7b131 /tool | |
| parent | 33fd6f48682b15e140d479574ec3377610acb22d (diff) | |
openpgp: Implement From<Fingerprint> for KeyID.
- Remove Fingerprint::to_keyid, use From instead.
Diffstat (limited to 'tool')
| -rw-r--r-- | tool/src/commands/decrypt.rs | 10 | ||||
| -rw-r--r-- | tool/src/commands/mod.rs | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tool/src/commands/decrypt.rs b/tool/src/commands/decrypt.rs index 095e247a..b85e6797 100644 --- a/tool/src/commands/decrypt.rs +++ b/tool/src/commands/decrypt.rs @@ -54,12 +54,12 @@ impl<'a> Helper<'a> { let hint = match tsk.userids().nth(0) { Some(uid) => format!("{} ({})", uid.userid(), - tsk.fingerprint().to_keyid()), - None => format!("{}", tsk.fingerprint().to_keyid()), + KeyID::from(tsk.fingerprint())), + None => format!("{}", KeyID::from(tsk.fingerprint())), }; if can_encrypt(tsk.primary(), tsk.primary_key_signature(None)) { - let id = tsk.fingerprint().to_keyid(); + let id: KeyID = tsk.fingerprint().into(); keys.insert(id.clone(), tsk.primary().clone().into()); identities.insert(id.clone(), tsk.fingerprint()); hints.insert(id, hint.clone()); @@ -68,7 +68,7 @@ impl<'a> Helper<'a> { for skb in tsk.subkeys() { let key = skb.key(); if can_encrypt(key, skb.binding_signature(None)) { - let id = key.fingerprint().to_keyid(); + let id: KeyID = key.fingerprint().into(); keys.insert(id.clone(), key.clone().into()); identities.insert(id.clone(), tsk.fingerprint()); hints.insert(id, hint.clone()); @@ -101,7 +101,7 @@ impl<'a> Helper<'a> { -> openpgp::Result<Option<Fingerprint>> where D: FnMut(SymmetricAlgorithm, &SessionKey) -> openpgp::Result<()> { - let keyid = keypair.public().fingerprint().to_keyid(); + let keyid = keypair.public().fingerprint().into(); match pkesk.decrypt(keypair) .and_then(|(algo, sk)| { decrypt(algo, &sk)?; Ok(sk) diff --git a/tool/src/commands/mod.rs b/tool/src/commands/mod.rs index 9bdb548a..6189ac4c 100644 --- a/tool/src/commands/mod.rs +++ b/tool/src/commands/mod.rs @@ -320,7 +320,7 @@ impl<'a> VerificationHelper for VHelper<'a> { .flat_map(|tpk| { // Even if a key is revoked or expired, we can still // use it to verify a message. - tpk.keys_all().map(|(_, _, key)| key.fingerprint().to_keyid()) + tpk.keys_all().map(|(_, _, key)| key.fingerprint().into()) }).collect(); // Explicitly provided keys are trusted. |