openpgp: Use KeyAmalgamation::for_xxx instead of building a KeyFlags

  - Use the convenient functions
    KeyAmalgamation::for_storage_encryption,
    KeyAmalgamation::for_transport_encryption, etc., instead of
    building up a KeyFlags and then calling
    KeyAmalgamation::key_flags.

  - This pattern requires less boilerplate.

1 files changed, 5 insertions, 9 deletions

diff --git a/ipc/examples/gpg-agent-decrypt.rs b/ipc/examples/gpg-agent-decrypt.rs
index 0f824d60..e76028ec 100644
--- a/ipc/examples/gpg-agent-decrypt.rs
+++ b/ipc/examples/gpg-agent-decrypt.rs
@@ -74,15 +74,11 @@ impl<'a> Helper<'a> {
         // Map (sub)KeyIDs to secrets.
         let mut keys = HashMap::new();
         for cert in certs {
-            for ka in cert.keys().policy(None) {
-                if ka.binding_signature(None)
-                    .map(|s| (s.key_flags().for_storage_encryption()
-                              || s.key_flags().for_transport_encryption()))
-                    .unwrap_or(false)
-                {
-                    let key = ka.key();
-                    keys.insert(key.keyid(), key.clone().into());
-                }
+            for ka in cert.keys().policy(None)
+                .for_storage_encryption().for_transport_encryption()
+            {
+                let key = ka.key();
+                keys.insert(key.keyid(), key.clone().into());
             }
         }