openpgp: Simplify key iteration interface.

  - Cert::keys_valid() is just a short-cut for
    Cert::keys_all().alive().revoked(false).

  - Remove Cert::keys_valid() and rename Cert::keys_all() to
    Cert::keys().

3 files changed, 10 insertions, 6 deletions

diff --git a/ipc/examples/gpg-agent-decrypt.rs b/ipc/examples/gpg-agent-decrypt.rs
index 381bab6d..2b9252cc 100644
--- a/ipc/examples/gpg-agent-decrypt.rs
+++ b/ipc/examples/gpg-agent-decrypt.rs
@@ -74,7 +74,7 @@ impl<'a> Helper<'a> {
         // Map (sub)KeyIDs to secrets.
         let mut keys = HashMap::new();
         for cert in certs {
-            for ka in cert.keys_all() {
+            for ka in cert.keys() {
                 if ka.binding_signature(None)
                     .map(|s| (s.key_flags().for_storage_encryption()
                               || s.key_flags().for_transport_encryption()))
diff --git a/ipc/examples/gpg-agent-sign.rs b/ipc/examples/gpg-agent-sign.rs
index dfc3f304..b5f32a9c 100644
--- a/ipc/examples/gpg-agent-sign.rs
+++ b/ipc/examples/gpg-agent-sign.rs
@@ -39,7 +39,7 @@ fn main() {
 
     // Construct a KeyPair for every signing-capable (sub)key.
     let mut signers = certs.iter().flat_map(|cert| {
-        cert.keys_valid().for_signing().filter_map(|ka| {
+        cert.keys().alive().revoked(false).for_signing().filter_map(|ka| {
             KeyPair::new(&ctx, ka.key()).ok()
         })
     }).collect::<Vec<KeyPair>>();
diff --git a/ipc/tests/gpg-agent.rs b/ipc/tests/gpg-agent.rs
index 6a74ffa3..889402b5 100644
--- a/ipc/tests/gpg-agent.rs
+++ b/ipc/tests/gpg-agent.rs
@@ -95,7 +95,9 @@ fn sign() {
         gpg_import(&ctx, &buf);
 
         let keypair = KeyPair::new(
-            &ctx, cert.keys_valid().for_signing().take(1).next().unwrap().key())
+            &ctx,
+            cert.keys().alive().revoked(false)
+                .for_signing().take(1).next().unwrap().key())
             .unwrap();
 
         let mut message = Vec::new();
@@ -208,7 +210,8 @@ fn decrypt() {
         let mut message = Vec::new();
         {
             let recipient =
-                cert.keys_valid().key_flags(
+                cert.keys().alive().revoked(false)
+                .key_flags(
                     KeyFlags::default().set_transport_encryption(true))
                 .map(|ka| ka.key().into())
                 .nth(0).unwrap();
@@ -275,8 +278,9 @@ fn decrypt() {
             {
                 let mut keypair = KeyPair::new(
                     self.ctx,
-                    self.cert.keys_valid().key_flags(
-                        KeyFlags::default().set_transport_encryption(true))
+                    self.cert.keys().alive().revoked(false).
+                        key_flags(
+                            KeyFlags::default().set_transport_encryption(true))
                         .take(1).next().unwrap().key())
                     .unwrap();