From 3eb554d0980ae788df2a07df609b77e01b7e57ce Mon Sep 17 00:00:00 2001
From: Justus Winter <justus@sequoia-pgp.org>
Date: Thu, 7 May 2020 15:36:37 +0200
Subject: openpgp: Use a builder to construct Decryptor.

  - See #498.
---
 ipc/examples/gpg-agent-decrypt.rs | 7 +++----
 ipc/tests/gpg-agent.rs            | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'ipc')

diff --git a/ipc/examples/gpg-agent-decrypt.rs b/ipc/examples/gpg-agent-decrypt.rs
index 163a83fb..254aebdd 100644
--- a/ipc/examples/gpg-agent-decrypt.rs
+++ b/ipc/examples/gpg-agent-decrypt.rs
@@ -15,7 +15,7 @@ use crate::openpgp::parse::{
     Parse,
     stream::{
         DecryptionHelper,
-        Decryptor,
+        DecryptorBuilder,
         VerificationHelper,
         GoodChecksum,
         VerificationError,
@@ -56,9 +56,8 @@ fn main() {
         }).collect();
 
     // Now, create a decryptor with a helper using the given Certs.
-    let mut decryptor =
-        Decryptor::from_reader(p, io::stdin(), Helper::new(&ctx, p, certs), None)
-        .unwrap();
+    let mut decryptor = DecryptorBuilder::from_reader(io::stdin()).unwrap()
+        .with_policy(p, None, Helper::new(&ctx, p, certs)).unwrap();
 
     // Finally, stream the decrypted data to stdout.
     io::copy(&mut decryptor, &mut io::stdout())
diff --git a/ipc/tests/gpg-agent.rs b/ipc/tests/gpg-agent.rs
index ab3a6b4a..d4800847 100644
--- a/ipc/tests/gpg-agent.rs
+++ b/ipc/tests/gpg-agent.rs
@@ -241,8 +241,8 @@ fn decrypt() -> openpgp::Result<()> {
         let helper = Helper { policy: p, ctx: &ctx, cert: &cert, };
 
         // Now, create a decryptor with a helper using the given Certs.
-        let mut decryptor = Decryptor::from_bytes(p, &message, helper, None)
-            .unwrap();
+        let mut decryptor = DecryptorBuilder::from_bytes(&message).unwrap()
+            .with_policy(p, None, helper).unwrap();
 
         // Decrypt the data.
         let mut sink = Vec::new();
-- 
cgit v1.2.3