james/yubikey.rs
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

try to discover if there is input waiting on stdin

Browse Source 
otherwise give the user a hint
resolves #12
This commit is contained in:
Klas Lindfors
2015-01-12 16:24:47 +01:00
parent 98320c2c0d
commit b1a673b1f9
3 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tool/yubico-piv-tool.c
+20
View File
@@ -290,6 +290,10 @@ static bool import_key(ykpiv_state *state, enum enum_key_format key_format,
return false;
}
if(input_file == stdin && !input_ready(input_file)) {
fprintf(stderr, "Please paste the private key...\n");
}
if(key_format == key_format_arg_PEM) {
private_key = PEM_read_PrivateKey(input_file, NULL, NULL, password);
if(!private_key) {
@@ -412,6 +416,10 @@ static bool import_cert(ykpiv_state *state, enum enum_key_format cert_format,
return false;
}
if(input_file == stdin && !input_ready(input_file)) {
fprintf(stderr, "Please paste the certificate...\n");
}
if(cert_format == key_format_arg_PEM) {
cert = PEM_read_X509(input_file, NULL, NULL, password);
if(!cert) {
@@ -555,6 +563,10 @@ static bool request_certificate(ykpiv_state *state, enum enum_key_format key_for
goto request_out;
}
if(input_file == stdin && !input_ready(input_file)) {
fprintf(stderr, "Please paste the public key...\n");
}
if(key_format == key_format_arg_PEM) {
public_key = PEM_read_PUBKEY(input_file, NULL, NULL, NULL);
if(!public_key) {
@@ -734,6 +746,10 @@ static bool selfsign_certificate(ykpiv_state *state, enum enum_key_format key_fo
goto selfsign_out;
}
if(input_file == stdin && !input_ready(input_file)) {
fprintf(stderr, "Please paste the public key...\n");
}
if(key_format == key_format_arg_PEM) {
public_key = PEM_read_PUBKEY(input_file, NULL, NULL, NULL);
if(!public_key) {
@@ -1007,6 +1023,10 @@ static bool sign_file(ykpiv_state *state, const char *input, const char *output,
return false;
}
if(input_file == stdin && !input_ready(input_file)) {
fprintf(stderr, "Please paste the input...\n");
}
output_file = open_file(output, OUTPUT);
if(!output_file) {
return false;