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

refactor change_pin() to use ykpiv_transfer_data()

Browse Source
This commit is contained in:
Klas Lindfors
2014-06-25 15:36:33 +02:00
parent b508f8bfea
commit b0ff83ac9c
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tool/yubico-piv-tool.c
+13 -11
View File
@@ -787,7 +787,8 @@ static bool verify_pin(ykpiv_state *state, const char *pin) {
* since they're very similar in what data they use. */ * since they're very similar in what data they use. */
static bool change_pin(ykpiv_state *state, enum enum_action action, const char *pin, static bool change_pin(ykpiv_state *state, enum enum_action action, const char *pin,
const char *new_pin) { const char *new_pin) {
APDU apdu; unsigned char templ[] = {0, YKPIV_INS_CHANGE_REFERENCE, 0, 0x81};
unsigned char indata[0x10];
unsigned char data[0xff]; unsigned char data[0xff];
unsigned long recv_len = sizeof(data); unsigned long recv_len = sizeof(data);
int sw; int sw;
@@ -799,20 +800,21 @@ static bool change_pin(ykpiv_state *state, enum enum_action action, const char *
return false; return false;
} }
memset(apdu.raw, 0, sizeof(apdu.raw)); if(action == action_arg_unblockMINUS_pin) {
apdu.st.ins = action == action_arg_unblockMINUS_pin ? templ[1] = YKPIV_INS_RESET_RETRY;
YKPIV_INS_RESET_RETRY : YKPIV_INS_CHANGE_REFERENCE; }
apdu.st.p2 = action == action_arg_changeMINUS_puk ? 0x81 : 0x80; else if(action == action_arg_changeMINUS_pin) {
apdu.st.lc = 0x10; templ[3] = 0x80;
memcpy(apdu.st.data, pin, pin_len); }
memcpy(indata, pin, pin_len);
if(pin_len < 8) { if(pin_len < 8) {
memset(apdu.st.data + pin_len, 0xff, 8 - pin_len); memset(indata + pin_len, 0xff, 8 - pin_len);
} }
memcpy(apdu.st.data + 8, new_pin, new_len); memcpy(indata + 8, new_pin, new_len);
if(new_len < 8) { if(new_len < 8) {
memset(apdu.st.data + 8 + new_len, 0xff, 16 - new_len); memset(indata + 8 + new_len, 0xff, 16 - new_len);
} }
if(ykpiv_send_data(state, apdu.raw, data, &recv_len, &sw) != YKPIV_OK) { if(ykpiv_transfer_data(state, templ, indata, sizeof(indata), data, &recv_len, &sw) != YKPIV_OK) {
return false; return false;
} else if(sw != 0x9000) { } else if(sw != 0x9000) {
if((sw >> 8) == 0x63) { if((sw >> 8) == 0x63) {