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 /sqv | |
| parent | 33fd6f48682b15e140d479574ec3377610acb22d (diff) | |
openpgp: Implement From<Fingerprint> for KeyID.
- Remove Fingerprint::to_keyid, use From instead.
Diffstat (limited to 'sqv')
| -rw-r--r-- | sqv/src/sqv.rs | 2 | ||||
| -rw-r--r-- | sqv/tests/revoked-key.rs | 12 | ||||
| -rw-r--r-- | sqv/tests/wrong-key-flags.rs | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sqv/src/sqv.rs b/sqv/src/sqv.rs index 193dc88c..71ffd912 100644 --- a/sqv/src/sqv.rs +++ b/sqv/src/sqv.rs @@ -108,7 +108,7 @@ fn real_main() -> Result<(), failure::Error> { // XXX: We use a KeyID even though we have a // fingerprint! - sigs.push((sig, fp.to_keyid(), None)); + sigs.push((sig, fp.into(), None)); } else if let Some(keyid) = sig.issuer() { if trace { eprintln!("Will check signature allegedly issued by {}.", diff --git a/sqv/tests/revoked-key.rs b/sqv/tests/revoked-key.rs index dd7ef26b..7667a003 100644 --- a/sqv/tests/revoked-key.rs +++ b/sqv/tests/revoked-key.rs @@ -96,7 +96,7 @@ mod integration { // b.set_signature_creation_time(t1).unwrap(); // b.set_key_expiration_time(Some(time::Duration::weeks(10 * 52))).unwrap(); // b.set_issuer_fingerprint(key.fingerprint()).unwrap(); -// b.set_issuer(key.fingerprint().to_keyid()).unwrap(); +// b.set_issuer(key.fingerprint().into()).unwrap(); // b.set_preferred_hash_algorithms(vec![HashAlgorithm::SHA512]).unwrap(); // let bind1 = b.sign_primary_key_binding( // &mut KeyPair::new(key.clone(), mpis.clone()).unwrap(), @@ -106,7 +106,7 @@ mod integration { // b = signature::Builder::new(SignatureType::KeyRevocation); // b.set_signature_creation_time(t2).unwrap(); // b.set_issuer_fingerprint(key.fingerprint()).unwrap(); -// b.set_issuer(key.fingerprint().to_keyid()).unwrap(); +// b.set_issuer(key.fingerprint().into()).unwrap(); // let rev = b.sign_primary_key_binding( // &mut KeyPair::new(key.clone(), mpis.clone()).unwrap(), // HashAlgorithm::SHA512).unwrap(); @@ -118,7 +118,7 @@ mod integration { // b.set_signature_creation_time(t3).unwrap(); // b.set_key_expiration_time(Some(time::Duration::weeks(10 * 52))).unwrap(); // b.set_issuer_fingerprint(key.fingerprint()).unwrap(); -// b.set_issuer(key.fingerprint().to_keyid()).unwrap(); +// b.set_issuer(key.fingerprint().into()).unwrap(); // b.set_preferred_hash_algorithms(vec![HashAlgorithm::SHA512]).unwrap(); // let bind2 = b.sign_primary_key_binding( // &mut KeyPair::new(key.clone(), mpis.clone()).unwrap(), @@ -129,7 +129,7 @@ mod integration { // b.set_features(&Features::sequoia()).unwrap(); // b.set_signature_creation_time(t12).unwrap(); // b.set_issuer_fingerprint(key.fingerprint()).unwrap(); -// b.set_issuer(key.fingerprint().to_keyid()).unwrap(); +// b.set_issuer(key.fingerprint().into()).unwrap(); // let sig1 = b.sign_message( // &mut KeyPair::new(key.clone(), mpis.clone()).unwrap(), // HashAlgorithm::SHA512, msg).unwrap(); @@ -139,7 +139,7 @@ mod integration { // b.set_features(&Features::sequoia()).unwrap(); // b.set_signature_creation_time(t23).unwrap(); // b.set_issuer_fingerprint(key.fingerprint()).unwrap(); -// b.set_issuer(key.fingerprint().to_keyid()).unwrap(); +// b.set_issuer(key.fingerprint().into()).unwrap(); // let sig2 = b.sign_message( // &mut KeyPair::new(key.clone(), mpis.clone()).unwrap(), // HashAlgorithm::SHA512, msg).unwrap(); @@ -149,7 +149,7 @@ mod integration { // b.set_features(&Features::sequoia()).unwrap(); // b.set_signature_creation_time(time::now()).unwrap(); // b.set_issuer_fingerprint(key.fingerprint()).unwrap(); -// b.set_issuer(key.fingerprint().to_keyid()).unwrap(); +// b.set_issuer(key.fingerprint().into()).unwrap(); // let sig3 = b.sign_message( // &mut KeyPair::new(key.clone(), mpis.clone()).unwrap(), // HashAlgorithm::SHA512, msg).unwrap(); diff --git a/sqv/tests/wrong-key-flags.rs b/sqv/tests/wrong-key-flags.rs index 926d184c..dafbc6f9 100644 --- a/sqv/tests/wrong-key-flags.rs +++ b/sqv/tests/wrong-key-flags.rs @@ -53,7 +53,7 @@ mod integration { // let mut b = signature::Builder::new(SignatureType::Binary); // b.set_signature_creation_time(time::now()).unwrap(); // b.set_issuer_fingerprint(key.fingerprint()).unwrap(); -// b.set_issuer(key.fingerprint().to_keyid()).unwrap(); +// b.set_issuer(key.fingerprint().into()).unwrap(); // b.sign_message( // &mut KeyPair::new(key.clone(), mpis.clone()).unwrap(), // HashAlgorithm::SHA512, b"Hello, World").unwrap() |