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

Change behavior of yubico-piv-tool -a status.

Browse Source 
Status only prints information from populated slots. Additionally,
it is possible to explicitly choose a single slot and only print
information reagarding it.
This commit is contained in:
Alessio Di Mauro
2015-11-20 14:34:05 +01:00
parent fe56e288d9
commit 3b81112aeb
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tool/yubico-piv-tool.c
+22 -7
View File
@@ -1168,6 +1168,7 @@ out:
static void print_cert_info(ykpiv_state *state, enum enum_slot slot, const EVP_MD *md, static void print_cert_info(ykpiv_state *state, enum enum_slot slot, const EVP_MD *md,
FILE *output) { FILE *output) {
int object = get_object_id(slot); int object = get_object_id(slot);
int slot_name;
unsigned char data[2048]; unsigned char data[2048];
const unsigned char *ptr = data; const unsigned char *ptr = data;
unsigned long len = sizeof(data); unsigned long len = sizeof(data);
@@ -1177,10 +1178,18 @@ static void print_cert_info(ykpiv_state *state, enum enum_slot slot, const EVP_M
BIO *bio = NULL; BIO *bio = NULL;
if(ykpiv_fetch_object(state, object, data, &len) != YKPIV_OK) { if(ykpiv_fetch_object(state, object, data, &len) != YKPIV_OK) {
fprintf(output, "No data available.\n");
return; return;
} }
if (slot == slot_arg_9a)
slot_name = 0x9a;
else if (slot >= slot_arg_9c && slot <= slot_arg_9e)
slot_name = 0x9b + slot;
else
slot_name = 0x82 + (slot - slot_arg_82);
fprintf(output, "Slot %x:\t", slot_name);
if(*ptr++ == 0x70) { if(*ptr++ == 0x70) {
unsigned int md_len = sizeof(data); unsigned int md_len = sizeof(data);
ASN1_TIME *not_before, *not_after; ASN1_TIME *not_before, *not_after;
@@ -1267,10 +1276,12 @@ cert_out:
} }
static bool status(ykpiv_state *state, enum enum_hash hash, static bool status(ykpiv_state *state, enum enum_hash hash,
const char *output_file_name) { enum enum_slot slot,
const char *output_file_name) {
const EVP_MD *md; const EVP_MD *md;
unsigned char chuid[2048]; unsigned char chuid[2048];
long unsigned len = sizeof(chuid); long unsigned len = sizeof(chuid);
int i;
FILE *output_file = open_file(output_file_name, OUTPUT); FILE *output_file = open_file(output_file_name, OUTPUT);
if(!output_file) { if(!output_file) {
return false; return false;
@@ -1288,14 +1299,18 @@ static bool status(ykpiv_state *state, enum enum_hash hash,
dump_hex(chuid, len, output_file, false); dump_hex(chuid, len, output_file, false);
} }
fprintf(output_file, "Slot 9a:\t"); if (slot == slot__NULL)
print_cert_info(state, slot_arg_9a, md, output_file); for (i = 0; i < 24; i++) {
fprintf(output_file, "Slot 9c:\t"); print_cert_info(state, i, md, output_file);
}
else
print_cert_info(state, slot, md, output_file);
/*fprintf(output_file, "Slot 9c:\t");
print_cert_info(state, slot_arg_9c, md, output_file); print_cert_info(state, slot_arg_9c, md, output_file);
fprintf(output_file, "Slot 9d:\t"); fprintf(output_file, "Slot 9d:\t");
print_cert_info(state, slot_arg_9d, md, output_file); print_cert_info(state, slot_arg_9d, md, output_file);
fprintf(output_file, "Slot 9e:\t"); fprintf(output_file, "Slot 9e:\t");
print_cert_info(state, slot_arg_9e, md, output_file); print_cert_info(state, slot_arg_9e, md, output_file);*/
{ {
int tries; int tries;
@@ -1877,7 +1892,7 @@ int main(int argc, char *argv[]) {
} }
break; break;
case action_arg_status: case action_arg_status:
if(status(state, args_info.hash_arg, args_info.output_arg) == false) { if(status(state, args_info.hash_arg, args_info.slot_arg, args_info.output_arg) == false) {
ret = EXIT_FAILURE; ret = EXIT_FAILURE;
} }
break; break;