From f2f1db13b429de78745108a63f1ff7f21a4a3552 Mon Sep 17 00:00:00 2001
From: "Neal H. Walfield" <neal@pep.foundation>
Date: Tue, 21 Jan 2020 12:36:21 +0100
Subject: 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.
---
 net/src/lib.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'net')

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))
-- 
cgit v1.2.3