diff options
author | Neal H. Walfield <neal@pep.foundation> | 2020-01-06 22:36:01 +0100 |
---|---|---|
committer | Neal H. Walfield <neal@pep.foundation> | 2020-01-06 23:01:29 +0100 |
commit | fc6ded10e255a2fc4423e7f360951a2f3eed5d6f (patch) | |
tree | b478c144171354bbf518a0d94d371a75139a94b4 /ipc | |
parent | fe16487556c2b4d16400515aea8c448b0890e74c (diff) |
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.
Diffstat (limited to 'ipc')
-rw-r--r-- | ipc/examples/gpg-agent-decrypt.rs | 14 | ||||
-rw-r--r-- | ipc/tests/gpg-agent.rs | 7 |
2 files changed, 7 insertions, 14 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()); } } diff --git a/ipc/tests/gpg-agent.rs b/ipc/tests/gpg-agent.rs index b76a24d9..bc2967a2 100644 --- a/ipc/tests/gpg-agent.rs +++ b/ipc/tests/gpg-agent.rs @@ -12,7 +12,6 @@ use crate::openpgp::types::{ SymmetricAlgorithm, }; use crate::openpgp::crypto::SessionKey; -use crate::openpgp::types::KeyFlags; use crate::openpgp::parse::stream::*; use crate::openpgp::serialize::{Serialize, stream::*}; use crate::openpgp::cert::{CertBuilder, CipherSuite}; @@ -211,8 +210,7 @@ fn decrypt() { { let recipient = cert.keys().policy(None).alive().revoked(false) - .key_flags( - KeyFlags::default().set_transport_encryption(true)) + .for_transport_encryption() .map(|ka| ka.key().into()) .nth(0).unwrap(); @@ -279,8 +277,7 @@ fn decrypt() { let mut keypair = KeyPair::new( self.ctx, self.cert.keys().policy(None).alive().revoked(false) - .key_flags( - KeyFlags::default().set_transport_encryption(true)) + .for_transport_encryption() .take(1).next().unwrap().key()) .unwrap(); |