Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Automatically verify cached pin and retry general auth on sw = 6982 #338

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Automatically verify cached pin and retry general auth on sw = 6982 #338

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 20 additions & 7 deletions lib/ykpiv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1241,25 +1241,38 @@ static ykpiv_rc _general_authenticate(ykpiv_state *state,
memcpy(dataptr, sign_in, in_len);
dataptr += in_len;

if((res = _ykpiv_transfer_data(state, templ, indata, (unsigned long)(dataptr - indata), data, &recv_len, &sw)) != YKPIV_OK) {
retry:
DBG("General authenticate with key %x.", key);
recv_len = sizeof(data);
if((res = _ykpiv_transfer_data(state, templ, indata, (long)(dataptr - indata), data, &recv_len, &sw)) != YKPIV_OK) {
DBG("General authenticate command failed to communicate: %s.", ykpiv_strerror(res));
return res;
}
res = ykpiv_translate_sw(sw);
if(res != YKPIV_OK) {
DBG("Sign command failed");
} else if(sw != SW_SUCCESS) {
res = YKPIV_GENERIC_ERROR;
DBG("General authenticate command failed with status %x.", sw);
if (sw == SW_ERR_SECURITY_STATUS) {
res = YKPIV_AUTHENTICATION_ERROR;
if(state->pin) {
DBG("Verify cached pin.");
if((res = _ykpiv_verify(state, state->pin, strlen(state->pin))) == YKPIV_OK) {
goto retry;
}
DBG("Verify cached pin failed: %s.", ykpiv_strerror(res));
}
}
return res;
}
/* skip the first 7c tag */
if(data[0] != 0x7c) {
DBG("Failed parsing signature reply.");
DBG("Failed parsing general authenticate reply.");
return YKPIV_PARSE_ERROR;
}
dataptr = data + 1;
offs = _ykpiv_get_length(dataptr, data + recv_len, &len);
dataptr += offs;
/* skip the 82 tag */
if(!offs || *dataptr != 0x82) {
DBG("Failed parsing signature reply.");
DBG("Failed parsing general authenticate reply.");
return YKPIV_PARSE_ERROR;
}
dataptr++;
Expand Down