openpgp: Rework streaming encryptor.

  - Instead of giving a set of TPKs to the encryptor, hand in a set of
    recipients, which are (keyid, key)-tuples, conveniently created
    from key queries over TPKs.  This simplifies the encryptor, and
    makes the key selection explicit.

  - Drop the EncryptionMode type.

  - As a nice side effect, we can now generate encrypted messages with
    wildcard recipient addresses.

1 files changed, 8 insertions, 2 deletions

diff --git a/ipc/tests/gpg-agent.rs b/ipc/tests/gpg-agent.rs
index ea07a4e1..707f2bb6 100644
--- a/ipc/tests/gpg-agent.rs
+++ b/ipc/tests/gpg-agent.rs
@@ -200,14 +200,20 @@ fn decrypt() {
 
         let mut message = Vec::new();
         {
+            // Build a vector of recipients to hand to Encryptor.
+            let recipients =
+                tpk.keys_valid().key_flags(
+                    KeyFlags::default().set_encrypt_for_transport(true))
+                .map(|(_, _, key)| key.into())
+                .collect::<Vec<Recipient>>();
+
             // Start streaming an OpenPGP message.
             let message = Message::new(&mut message);
 
             // We want to encrypt a literal data packet.
             let encryptor = Encryptor::new(message,
                                            &[], // No symmetric encryption.
-                                           &[&tpk],
-                                           EncryptionMode::ForTransport,
+                                           recipients,
                                            None, None).unwrap();
 
             // Emit a literal data packet.