mirrors/rage
1
0
Fork 0
mirror of https://github.com/str4d/rage.git synced 2025-04-04 11:27:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

age: Add age::cli_common::Passphrase::random

Browse source
This commit is contained in:
Jack Grigg 2021-09-13 00:15:18 +01:00
parent b4e54854d4
commit b29cc2ed80
2 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
age/CHANGELOG.md
View file

@ -16,6 +16,7 @@ to 1.0.0 are beta releases.
within an age identity file.
- `age::{DecryptError, EncryptError, PluginError}: Clone` bounds.
- `age::cli_common::UiCallbacks: Clone + Copy` bounds.
- `age::cli_common::Passphrase::random`, for generating a secure passphrase.
### Changed
- MSRV is now 1.51.0.

30
age/src/cli_common.rs
View file

@ -4,6 +4,7 @@ use pinentry::PassphraseInput;
use rand::{
distributions::{Distribution, Uniform},
rngs::OsRng,
CryptoRng, RngCore,
};
use rpassword::read_password_from_tty;
use secrecy::{ExposeSecret, SecretString};
@ -171,18 +172,10 @@ pub enum Passphrase {
Generated(SecretString),
}
/// Reads a passphrase from stdin, or generates a secure one if none is provided.
pub fn read_or_generate_passphrase() -> pinentry::Result<Passphrase> {
let res = read_secret(
&fl!("cli-passphrase-desc"),
&fl!("cli-passphrase-prompt"),
Some(&fl!("cli-passphrase-confirm")),
)?;
if res.expose_secret().is_empty() {
// Generate a secure passphrase
impl Passphrase {
/// Generates a secure passphrase.
pub fn random<R: RngCore + CryptoRng>(mut rng: R) -> Self {
let between = Uniform::from(0..2048);
let mut rng = OsRng;
let new_passphrase = (0..10)
.map(|_| {
BIP39_WORDLIST
@ -197,7 +190,20 @@ pub fn read_or_generate_passphrase() -> pinentry::Result<Passphrase> {
acc + "-" + s
}
});
Ok(Passphrase::Generated(SecretString::new(new_passphrase)))
Passphrase::Generated(SecretString::new(new_passphrase))
}
}
/// Reads a passphrase from stdin, or generates a secure one if none is provided.
pub fn read_or_generate_passphrase() -> pinentry::Result<Passphrase> {
let res = read_secret(
&fl!("cli-passphrase-desc"),
&fl!("cli-passphrase-prompt"),
Some(&fl!("cli-passphrase-confirm")),
)?;
if res.expose_secret().is_empty() {
Ok(Passphrase::random(OsRng))
} else {
Ok(Passphrase::Typed(res))
}