From 60cc0a8d01881c11b35263b3be91b63c98ffb4a1 Mon Sep 17 00:00:00 2001
From: Alexis Sellier <self@cloudhead.io>
Date: Mon, 24 Jul 2023 12:27:45 +0200
Subject: [PATCH] crypto: Improve error for missing passphrase

---
 radicle-crypto/src/ssh/keystore.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/radicle-crypto/src/ssh/keystore.rs b/radicle-crypto/src/ssh/keystore.rs
index 72d7bd9c..93bc53b9 100644
--- a/radicle-crypto/src/ssh/keystore.rs
+++ b/radicle-crypto/src/ssh/keystore.rs
@@ -23,6 +23,8 @@ pub enum Error {
     InvalidKeyType,
     #[error("keystore already initialized")]
     AlreadyInitialized,
+    #[error("keystore is encrypted; a passphrase is required")]
+    PassphraseMissing,
 }
 
 impl Error {
@@ -123,6 +125,8 @@ impl Keystore {
         let secret = ssh_key::PrivateKey::read_openssh_file(&path)?;
         let secret = if let Some(p) = passphrase {
             secret.decrypt(p)?
+        } else if secret.is_encrypted() {
+            return Err(Error::PassphraseMissing);
         } else {
             secret
         };