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

refactor reset to use ykpiv_transfer_data() instead

Browse Source
This commit is contained in:
Klas Lindfors
2014-06-25 15:22:04 +02:00
parent 00343b9b6c
commit 28ab285d92
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tool/yubico-piv-tool.c
+3 -4
View File
@@ -226,15 +226,13 @@ generate_out:
} }
static bool reset(ykpiv_state *state) { static bool reset(ykpiv_state *state) {
APDU apdu; unsigned char templ[] = {0, YKPIV_INS_RESET, 0, 0};
unsigned char data[0xff]; unsigned char data[0xff];
unsigned long recv_len = sizeof(data); unsigned long recv_len = sizeof(data);
int sw; int sw;
memset(apdu.raw, 0, sizeof(apdu));
/* note: the reset function is only available when both pins are blocked. */ /* note: the reset function is only available when both pins are blocked. */
apdu.st.ins = YKPIV_INS_RESET; if(ykpiv_transfer_data(state, templ, NULL, 0, data, &recv_len, &sw) != YKPIV_OK) {
if(ykpiv_send_data(state, apdu.raw, data, &recv_len, &sw) != YKPIV_OK) {
return false; return false;
} else if(sw == 0x9000) { } else if(sw == 0x9000) {
return true; return true;
@@ -954,6 +952,7 @@ int main(int argc, char *argv[]) {
break; break;
case action_arg_reset: case action_arg_reset:
if(reset(state) == false) { if(reset(state) == false) {
fprintf(stderr, "Reset failed, are pincodes blocked?\n");
ret = EXIT_FAILURE; ret = EXIT_FAILURE;
} else { } else {
printf("Successfully reset the applet.\n"); printf("Successfully reset the applet.\n");