diff options
author | Justus Winter <justus@sequoia-pgp.org> | 2020-05-07 14:16:08 +0200 |
---|---|---|
committer | Justus Winter <justus@sequoia-pgp.org> | 2020-05-07 14:26:30 +0200 |
commit | 50b3ed9a61161761f20d134b13c2f8ac07698ea5 (patch) | |
tree | d6d3c6e57acd182ec51832e89d79ebce6b496b20 /openpgp/src/policy.rs | |
parent | a207220e5a9864b8a205c7e75eee8ea37bdb8c5a (diff) |
openpgp: Use a builder to construct Verifier.
- See #498.
Diffstat (limited to 'openpgp/src/policy.rs')
-rw-r--r-- | openpgp/src/policy.rs | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/openpgp/src/policy.rs b/openpgp/src/policy.rs index 6aaedb64..f5be5ce9 100644 --- a/openpgp/src/policy.rs +++ b/openpgp/src/policy.rs @@ -982,7 +982,7 @@ mod test { use crate::parse::stream::MessageLayer; use crate::parse::stream::MessageStructure; use crate::parse::stream::VerificationHelper; - use crate::parse::stream::Verifier; + use crate::parse::stream::VerifierBuilder; use crate::policy::StandardPolicy as P; use crate::types::Curve; use crate::types::KeyFlags; @@ -1151,7 +1151,7 @@ mod test { #[test] - fn binary_signature() { + fn binary_signature() -> Result<()> { #[derive(PartialEq, Debug)] struct VHelper { good: usize, @@ -1255,12 +1255,8 @@ mod test { // Standard policy => ok. let h = VHelper::new(keys.clone()); - let mut v = - match Verifier::from_bytes(standard, crate::tests::file(data), h, - crate::frozen_time()) { - Ok(v) => v, - Err(e) => panic!("{}", e), - }; + let mut v = VerifierBuilder::from_bytes(crate::tests::file(data))? + .with_policy(standard, crate::frozen_time(), h)?; assert!(v.message_processed()); assert_eq!(v.helper_ref().good, 1); assert_eq!(v.helper_ref().errors, 0); @@ -1273,12 +1269,8 @@ mod test { // Kill the subkey. let h = VHelper::new(keys.clone()); - let mut v = match Verifier::from_bytes(no_subkey_signatures, - crate::tests::file(data), h, - crate::frozen_time()) { - Ok(v) => v, - Err(e) => panic!("{}", e), - }; + let mut v = VerifierBuilder::from_bytes(crate::tests::file(data))? + .with_policy(no_subkey_signatures, crate::frozen_time(), h)?; assert!(v.message_processed()); assert_eq!(v.helper_ref().good, 0); assert_eq!(v.helper_ref().errors, 1); @@ -1291,13 +1283,8 @@ mod test { // Kill the data signature. let h = VHelper::new(keys.clone()); - let mut v = - match Verifier::from_bytes(no_binary_signatures, - crate::tests::file(data), h, - crate::frozen_time()) { - Ok(v) => v, - Err(e) => panic!("{}", e), - }; + let mut v = VerifierBuilder::from_bytes(crate::tests::file(data))? + .with_policy(no_binary_signatures, crate::frozen_time(), h)?; assert!(v.message_processed()); assert_eq!(v.helper_ref().good, 0); assert_eq!(v.helper_ref().errors, 1); @@ -1364,6 +1351,7 @@ mod test { v.read_to_end(&mut content).unwrap(); assert_eq!(reference.len(), content.len()); assert_eq!(reference, &content[..]); + Ok(()) } #[test] |