giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pkcs15-tool: only print Auth ID if present 

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4737 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
martin 2010-09-20 23:10:23 +00:00
parent 215b3fc056
commit 09fb4468d0
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/tools/pkcs15-tool.c
View File

@ -458,7 +458,6 @@ static int list_data_objects(void)
} else
printf("NONE\n");
printf("Path: %s\n", sc_print_path(&cinfo->path));
printf("Auth ID: %s\n", sc_pkcs15_print_id(&objs[i]->auth_id));
if (objs[i]->auth_id.len == 0) {
struct sc_pkcs15_data *data_object;
r = sc_pkcs15_read_data_object(p15card, cinfo, &data_object);
@ -470,6 +469,8 @@ static int list_data_objects(void)
}
r = list_data_object("Data Object", data_object->data, data_object->data_len);
sc_pkcs15_free_data_object(data_object);
} else {
printf("Auth ID: %s\n", sc_pkcs15_print_id(&objs[i]->auth_id));
}
}
return 0;
@ -515,7 +516,8 @@ static void print_prkey_info(const struct sc_pkcs15_object *obj)
printf("\tKey ref : %d\n", prkey->key_reference);
printf("\tNative : %s\n", prkey->native ? "yes" : "no");
printf("\tPath : %s\n", sc_print_path(&prkey->path));
printf("\tAuth ID : %s\n", sc_pkcs15_print_id(&obj->auth_id));
if (obj->auth_id.len != 0)
printf("\tAuth ID : %s\n", sc_pkcs15_print_id(&obj->auth_id));
printf("\tID : %s\n", sc_pkcs15_print_id(&prkey->id));
}
@ -579,7 +581,8 @@ static void print_pubkey_info(const struct sc_pkcs15_object *obj)
printf("\tKey ref : %d\n", pubkey->key_reference);
printf("\tNative : %s\n", pubkey->native ? "yes" : "no");
printf("\tPath : %s\n", sc_print_path(&pubkey->path));
printf("\tAuth ID : %s\n", sc_pkcs15_print_id(&obj->auth_id));
if (obj->auth_id.len != 0)
printf("\tAuth ID : %s\n", sc_pkcs15_print_id(&obj->auth_id));
printf("\tID : %s\n", sc_pkcs15_print_id(&pubkey->id));
}