openpgp: Split VerificationResult.

  - Split VerificationResult into Result<GoodChecksum,
    VerificationError>.

  - Fixes #416.

2 files changed, 8 insertions, 23 deletions

diff --git a/openpgp/examples/decrypt-with.rs b/openpgp/examples/decrypt-with.rs
index c4b9f56a..ca84a918 100644
--- a/openpgp/examples/decrypt-with.rs
+++ b/openpgp/examples/decrypt-with.rs
@@ -16,7 +16,7 @@ use crate::openpgp::parse::{
         DecryptionHelper,
         Decryptor,
         VerificationHelper,
-        VerificationResult,
+        GoodChecksum,
         MessageStructure,
         MessageLayer,
     },
@@ -108,7 +108,6 @@ impl VerificationHelper for Helper {
     }
     fn check(&mut self, structure: MessageStructure)
              -> failure::Fallible<()> {
-        use self::VerificationResult::*;
         for layer in structure.iter() {
             match layer {
                 MessageLayer::Compression { algo } =>
@@ -123,19 +122,11 @@ impl VerificationHelper for Helper {
                 MessageLayer::SignatureGroup { ref results } =>
                     for result in results {
                         match result {
-                            GoodChecksum { cert, .. } => {
-                                eprintln!("Good signature from {}", cert);
-                            },
-                            NotAlive { sig, .. } => {
-                                eprintln!("Good, but not alive signature from {:?}",
-                                          sig.get_issuers());
-                            },
-                            MissingKey { .. } => {
-                                eprintln!("No key to check signature");
-                            },
-                            Error { error, .. } => {
-                                eprintln!("Error: {}", error);
+                            Ok(GoodChecksum { ka, .. }) => {
+                                eprintln!("Good signature from {}", ka.cert());
                             },
+                            Err(e) =>
+                                eprintln!("Error: {:?}", e),
                         }
                     }
             }
diff --git a/openpgp/examples/generate-sign-verify.rs b/openpgp/examples/generate-sign-verify.rs
index d371a812..e5f21505 100644
--- a/openpgp/examples/generate-sign-verify.rs
+++ b/openpgp/examples/generate-sign-verify.rs
@@ -113,16 +113,10 @@ impl<'a> VerificationHelper for Helper<'a> {
                     // whether the signature checks out mathematically, we apply
                     // our policy.
                     match results.into_iter().next() {
-                        Some(VerificationResult::GoodChecksum { .. }) =>
+                        Some(Ok(_)) =>
                             good = true,
-                        Some(VerificationResult::NotAlive { .. }) =>
-                            return Err(failure::err_msg(
-                                "Signature good, but not alive")),
-                        Some(VerificationResult::MissingKey { .. }) =>
-                            return Err(failure::err_msg(
-                                "Missing key to verify signature")),
-                        Some(VerificationResult::Error { error, .. }) =>
-                            return Err(error),
+                        Some(Err(e)) =>
+                            return Err(openpgp::Error::from(e).into()),
                         None =>
                             return Err(failure::err_msg("No signature")),
                     }