summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorNeal H. Walfield <neal@pep.foundation>2020-01-21 12:36:21 +0100
committerNeal H. Walfield <neal@pep.foundation>2020-01-21 14:51:25 +0100
commitf2f1db13b429de78745108a63f1ff7f21a4a3552 (patch)
tree108ed79fd6f841510086059dd4ca1699d179239a /net
parent8897d08a3281c5744bc842be0dcba92439e84085 (diff)
openpgp: Change KeyIter to return KeyAmalgamations.
- Change KeyIter to return KeyAmalgamations instead of Keys. - Given a `KeyAmalgamation`, it is possible to turn it into a `ValidKeyAmalgamation`. This is not possible with a `Key`. - With a `KeyAmalgamation`, it is still possible to query things about the certificate.
Diffstat (limited to 'net')
-rw-r--r--net/src/lib.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/src/lib.rs b/net/src/lib.rs
index 048031fe..f7add939 100644
--- a/net/src/lib.rs
+++ b/net/src/lib.rs
@@ -182,8 +182,8 @@ impl KeyServer {
Some(armor::Kind::PublicKey)));
match Cert::from_reader(r) {
Ok(cert) => {
- if cert.keys().any(|key| {
- KeyID::from(key.fingerprint())
+ if cert.keys().any(|ka| {
+ KeyID::from(ka.key().fingerprint())
== keyid_want
}) {
future::done(Ok(cert))