turnkey/openpgp-card
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Print guidance for the '--card' parameter in status/ssh, when more than one card is plugged in.

Browse source
This commit is contained in:
Heiko Schaefer 2022-03-25 21:05:40 +01:00
parent b2d061d66c
commit e18affc1ea
No known key found for this signature in database
GPG key ID: 4A849A1904CCBD7D
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
tools/src/bin/opgpcard/main.rs
View file

@ -30,6 +30,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
match cli.cmd {
cli::Command::List {} => {
println!("Available OpenPGP cards:");
list_cards()?;
}
cli::Command::Status { ident, verbose } => {
@ -133,8 +134,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
fn list_cards() -> Result<()> {
let cards = util::cards()?;
if !cards.is_empty() {
println!("Available OpenPGP cards:");
for mut card in cards {
let mut pgp = OpenPgp::new(&mut card);
let open = Open::new(pgp.transaction()?)?;
@ -163,8 +162,17 @@ fn print_status(ident: Option<String>, verbose: bool) -> Result<()> {
let mut cards = util::cards()?;
if cards.len() == 1 {
Box::new(cards.pop().unwrap())
} else if cards.is_empty() {
return Err(anyhow::anyhow!("No cards found"));
} else {
return Err(anyhow::anyhow!("Found {} cards", cards.len()));
println!("Found {} cards:", cards.len());
list_cards()?;
println!();
println!("Specify which card to use with '--card <card ident>'");
println!();
return Err(anyhow::anyhow!("Specify card"));
}
};
@ -315,8 +323,17 @@ fn print_ssh(ident: Option<String>) -> Result<()> {
let mut cards = util::cards()?;
if cards.len() == 1 {
Box::new(cards.pop().unwrap())
} else if cards.is_empty() {
return Err(anyhow::anyhow!("No cards found"));
} else {
return Err(anyhow::anyhow!("Found {} cards", cards.len()));
println!("Found {} cards:", cards.len());
list_cards()?;
println!();
println!("Specify which card to use with '--card <card ident>'");
println!();
return Err(anyhow::anyhow!("Specify card"));
}
};