openpgp: Use a builder to construct Verifier.

  - See #498.

1 files changed, 4 insertions, 2 deletions

diff --git a/openpgp-ffi/src/parse/stream.rs b/openpgp-ffi/src/parse/stream.rs
index 227b75a4..a0a65df3 100644
--- a/openpgp-ffi/src/parse/stream.rs
+++ b/openpgp-ffi/src/parse/stream.rs
@@ -30,7 +30,7 @@ use self::openpgp::parse::stream::{
     DecryptionHelper,
     Decryptor,
     VerificationHelper,
-    Verifier,
+    VerifierBuilder,
 };
 
 use crate::Maybe;
@@ -643,10 +643,12 @@ fn pgp_verifier_new<'a>(errp: Option<&mut *mut crate::error::Error>,
                         time: time_t)
                         -> Maybe<io::Reader>
 {
+    ffi_make_fry_from_errp!(errp);
     let policy = policy.ref_raw().as_ref();
     let helper = VHelper::new(inspect, get_certs, check, cookie);
 
-    Verifier::from_reader(policy, input.ref_mut_raw(), helper, maybe_time(time))
+    ffi_try_or!(VerifierBuilder::from_reader(input.ref_mut_raw()), None)
+        .with_policy(policy, maybe_time(time), helper)
         .map(|r| io::ReaderKind::Generic(Box::new(r)))
         .move_into_raw(errp)
 }