mab122
/
radicle-heartwood-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crypto: Improve error for missing passphrase

This commit is contained in:
Alexis Sellier 2023-07-24 12:27:45 +02:00
parent de381cb378
commit 60cc0a8d01
No known key found for this signature in database
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
radicle-crypto/src/ssh/keystore.rs
View File

@ -23,6 +23,8 @@ pub enum Error {
InvalidKeyType, InvalidKeyType,
#[error("keystore already initialized")] #[error("keystore already initialized")]
AlreadyInitialized, AlreadyInitialized,
#[error("keystore is encrypted; a passphrase is required")]
PassphraseMissing,
} }
impl Error { impl Error {
@ -123,6 +125,8 @@ impl Keystore {
let secret = ssh_key::PrivateKey::read_openssh_file(&path)?; let secret = ssh_key::PrivateKey::read_openssh_file(&path)?;
let secret = if let Some(p) = passphrase { let secret = if let Some(p) = passphrase {
secret.decrypt(p)? secret.decrypt(p)?
} else if secret.is_encrypted() {
return Err(Error::PassphraseMissing);
} else { } else {
secret secret
}; };