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().

8 files changed, 18 insertions, 8 deletions

diff --git a/openpgp/examples/decrypt-with.rs b/openpgp/examples/decrypt-with.rs
index 7c924cc9..27977048 100644
--- a/openpgp/examples/decrypt-with.rs
+++ b/openpgp/examples/decrypt-with.rs
@@ -58,7 +58,7 @@ impl Helper {
         // 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/openpgp/examples/encrypt-for.rs b/openpgp/examples/encrypt-for.rs
index eceec5b3..93eba5b5 100644
--- a/openpgp/examples/encrypt-for.rs
+++ b/openpgp/examples/encrypt-for.rs
@@ -37,7 +37,9 @@ fn main() {
     // Build a vector of recipients to hand to Encryptor.
     let mut recipients =
         certs.iter()
-        .flat_map(|cert| cert.keys_valid().key_flags(mode.clone()))
+        .flat_map(|cert| {
+            cert.keys().alive().revoked(false).key_flags(mode.clone())
+        })
         .map(|ka| ka.key().into())
         .collect::<Vec<_>>();
 
diff --git a/openpgp/examples/generate-encrypt-decrypt.rs b/openpgp/examples/generate-encrypt-decrypt.rs
index 01782b47..416a4b73 100644
--- a/openpgp/examples/generate-encrypt-decrypt.rs
+++ b/openpgp/examples/generate-encrypt-decrypt.rs
@@ -42,7 +42,7 @@ fn encrypt(sink: &mut dyn Write, plaintext: &str, recipient: &openpgp::Cert)
            -> openpgp::Result<()> {
     // Build a vector of recipients to hand to Encryptor.
     let mut recipients =
-        recipient.keys_valid()
+        recipient.keys().alive().revoked(false)
         .for_transport_encryption()
         .map(|ka| ka.key().into())
         .collect::<Vec<_>>();
diff --git a/openpgp/examples/generate-sign-verify.rs b/openpgp/examples/generate-sign-verify.rs
index 1cccac44..a51ff031 100644
--- a/openpgp/examples/generate-sign-verify.rs
+++ b/openpgp/examples/generate-sign-verify.rs
@@ -40,7 +40,7 @@ fn generate() -> openpgp::Result<openpgp::Cert> {
 fn sign(sink: &mut dyn Write, plaintext: &str, tsk: &openpgp::Cert)
            -> openpgp::Result<()> {
     // Get the keypair to do the signing from the Cert.
-    let keypair = tsk.keys_valid().for_signing().nth(0).unwrap()
+    let keypair = tsk.keys().alive().revoked(false).for_signing().nth(0).unwrap()
         .key().clone().mark_parts_secret().unwrap().into_keypair()?;
 
     // Start streaming an OpenPGP message.
diff --git a/openpgp/examples/notarize.rs b/openpgp/examples/notarize.rs
index f52466f4..fec7419b 100644
--- a/openpgp/examples/notarize.rs
+++ b/openpgp/examples/notarize.rs
@@ -28,7 +28,9 @@ fn main() {
             .expect("Failed to read key");
         let mut n = 0;
 
-        for key in tsk.keys_valid().for_signing().secret().map(|ka| ka.key()) {
+        for key in tsk.keys().alive().revoked(false).for_signing().secret()
+                       .map(|ka| ka.key())
+        {
             keys.push({
                 let mut key = key.clone();
                 if key.secret().expect("filtered").is_encrypted() {
diff --git a/openpgp/examples/pad.rs b/openpgp/examples/pad.rs
index 32583a42..95625f51 100644
--- a/openpgp/examples/pad.rs
+++ b/openpgp/examples/pad.rs
@@ -39,7 +39,9 @@ fn main() {
     // Build a vector of recipients to hand to Encryptor.
     let mut recipients =
         certs.iter()
-        .flat_map(|cert| cert.keys_valid().key_flags(mode.clone()))
+        .flat_map(|cert| {
+            cert.keys().alive().revoked(false).key_flags(mode.clone())
+        })
         .map(|ka| Recipient::new(KeyID::wildcard(), ka.key()))
         .collect::<Vec<_>>();
 
diff --git a/openpgp/examples/sign-detached.rs b/openpgp/examples/sign-detached.rs
index 20d4150b..eea08f08 100644
--- a/openpgp/examples/sign-detached.rs
+++ b/openpgp/examples/sign-detached.rs
@@ -24,7 +24,9 @@ fn main() {
             .expect("Failed to read key");
         let mut n = 0;
 
-        for key in tsk.keys_valid().for_signing().secret().map(|ka| ka.key()) {
+        for key in tsk.keys().alive().revoked(false).for_signing().secret()
+                       .map(|ka| ka.key())
+        {
             keys.push({
                 let mut key = key.clone();
                 if key.secret().expect("filtered").is_encrypted() {
diff --git a/openpgp/examples/sign.rs b/openpgp/examples/sign.rs
index 7fae29ef..d8054fac 100644
--- a/openpgp/examples/sign.rs
+++ b/openpgp/examples/sign.rs
@@ -23,7 +23,9 @@ fn main() {
             .expect("Failed to read key");
         let mut n = 0;
 
-        for key in tsk.keys_valid().for_signing().secret().map(|ka| ka.key()) {
+        for key in tsk.keys().alive().revoked(false).for_signing().secret()
+                       .map(|ka| ka.key())
+        {
             keys.push({
                 let mut key = key.clone();
                 if key.secret().expect("filtered").is_encrypted() {