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

refactor pin-retries to use ykpiv_transfer_data()

Browse Source
This commit is contained in:
Klas Lindfors
2014-06-25 15:24:40 +02:00
parent 28ab285d92
commit a60096addf
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tool/yubico-piv-tool.c
+2 -6
View File
@@ -241,7 +241,7 @@ static bool reset(ykpiv_state *state) {
} }
static bool set_pin_retries(ykpiv_state *state, int pin_retries, int puk_retries, int verbose) { static bool set_pin_retries(ykpiv_state *state, int pin_retries, int puk_retries, int verbose) {
APDU apdu; unsigned char templ[] = {0, YKPIV_INS_SET_PIN_RETRIES, pin_retries, puk_retries};
unsigned char data[0xff]; unsigned char data[0xff];
unsigned long recv_len = sizeof(data); unsigned long recv_len = sizeof(data);
int sw; int sw;
@@ -255,11 +255,7 @@ static bool set_pin_retries(ykpiv_state *state, int pin_retries, int puk_retries
fprintf(stderr, "Setting pin retries to %d and puk retries to %d.\n", pin_retries, puk_retries); fprintf(stderr, "Setting pin retries to %d and puk retries to %d.\n", pin_retries, puk_retries);
} }
memset(apdu.raw, 0, sizeof(apdu)); if(ykpiv_transfer_data(state, templ, NULL, 0, data, &recv_len, &sw) != YKPIV_OK) {
apdu.st.ins = YKPIV_INS_SET_PIN_RETRIES;
apdu.st.p1 = pin_retries;
apdu.st.p2 = puk_retries;
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;