From f7371dd787a15fa66e234c90fa646400d354d552 Mon Sep 17 00:00:00 2001
From: Justus Winter <justus@sequoia-pgp.org>
Date: Mon, 25 May 2020 11:26:43 +0200
Subject: ffi: Gracefully handle encrypted secret keys in pgp_pkesk_decrypt.

  - Fixes #510.
---
 openpgp-ffi/src/packet/pkesk.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'openpgp-ffi/src')

diff --git a/openpgp-ffi/src/packet/pkesk.rs b/openpgp-ffi/src/packet/pkesk.rs
index 94166c11..084505ff 100644
--- a/openpgp-ffi/src/packet/pkesk.rs
+++ b/openpgp-ffi/src/packet/pkesk.rs
@@ -64,8 +64,9 @@ pub extern "C" fn pgp_pkesk_decrypt(errp: Option<&mut *mut crate::error::Error>,
             }
         },
         Err(e) => {
-            // XXX: Better message, don't panic.
-            panic!("Secret parts not unencrypted in {:?}: {}", secret_key, e);
+            ffi_try_status!(Err::<(), anyhow::Error>(
+                    openpgp::Error::InvalidOperation(
+                        format!("Unusable secret parts: {}", e)).into()))
         },
     }
 }
-- 
cgit v1.2.3