slipenkomk/sequoia-sq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Attempt to use previously submitted password for decrypting keys.

Browse Source 
When decrypting encrypted key material in `get_keys()` first attempt to
use passwords previously provided and only afterwards prompt the user
for a password.
This commit is contained in:
David Runge 2023-09-01 17:59:58 +02:00
parent 4e891fe36f
commit ccbbd64828
No known key found for this signature in database
GPG Key ID: 90D4B9641E092971
1 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/commands/mod.rs
View File

@ -136,16 +136,35 @@ fn get_keys<C>(certs: &[C], p: &dyn Policy,
if let Some(secret) = key.optional_secret() {
let (unencrypted, password) = match secret {
SecretKeyMaterial::Encrypted(ref e) => {
let input_password = rpassword::prompt_password(
&format!("Please enter password to decrypt {}/{}: ",
tsk, key))
.context("Reading password from tty")?;
(
e.decrypt(key.pk_algo(), &Password::from(input_password.to_string()))
.expect("decryption failed"),
Some(Password::from(input_password.to_string())),
)
},
// try passwords from already existing keys
match keys.iter().find(|&(_, password)| {
password.is_some()
&& e.decrypt(
key.pk_algo(),
password.as_ref().unwrap(),
)
.is_ok()
}) {
Some((_, password)) => (
e.decrypt(
key.pk_algo(),
password.as_ref().unwrap(),
)
.expect("decryption failed"),
Some(password.as_ref().unwrap().clone()),
),
None => {
let password = Password::from(rpassword::prompt_password(
&format!("Please enter password to decrypt {}/{}: ", tsk, key))
.context("Reading password from tty")?);
(
e.decrypt(key.pk_algo(), &password)
.expect("decryption failed"),
Some(password),
)
}
}
}
SecretKeyMaterial::Unencrypted(ref u) => (u.clone(), None),
};