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

refactor to ykpiv_transfer_data() for chuid setting

Browse Source
This commit is contained in:
Klas Lindfors
2014-06-25 15:28:44 +02:00
parent a60096addf
commit b508f8bfea
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tool/yubico-piv-tool.c
+5 -9
View File
@@ -472,14 +472,14 @@ import_cert_out:
} }
static bool set_chuid(ykpiv_state *state, int verbose) { static bool set_chuid(ykpiv_state *state, int verbose) {
APDU apdu; unsigned char templ[] = {0, YKPIV_INS_PUT_DATA, 0x3f, 0xff};
unsigned char data[0xff]; unsigned char data[0xff];
unsigned char *dataptr = apdu.st.data; unsigned char chuid[sizeof(chuid_tmpl)];
unsigned char *dataptr = chuid;
unsigned long recv_len = sizeof(data); unsigned long recv_len = sizeof(data);
int sw; int sw;
memset(apdu.raw, 0, sizeof(apdu)); memcpy(chuid, chuid_tmpl, sizeof(chuid));
memcpy(apdu.st.data, chuid_tmpl, sizeof(chuid_tmpl));
dataptr += CHUID_GUID_OFFS; dataptr += CHUID_GUID_OFFS;
if(RAND_pseudo_bytes(dataptr, 0x10) == -1) { if(RAND_pseudo_bytes(dataptr, 0x10) == -1) {
fprintf(stderr, "error: no randomness.\n"); fprintf(stderr, "error: no randomness.\n");
@@ -490,11 +490,7 @@ static bool set_chuid(ykpiv_state *state, int verbose) {
dump_hex(dataptr, 0x10); dump_hex(dataptr, 0x10);
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }
apdu.st.ins = YKPIV_INS_PUT_DATA; if(ykpiv_transfer_data(state, templ, chuid, sizeof(chuid), data, &recv_len, &sw) != YKPIV_OK) {
apdu.st.p1 = 0x3f;
apdu.st.p2 = 0xff;
apdu.st.lc = sizeof(chuid_tmpl);
if(ykpiv_send_data(state, apdu.raw, data, &recv_len, &sw) != YKPIV_OK) {
fprintf(stderr, "Failed communicating with device.\n"); fprintf(stderr, "Failed communicating with device.\n");
return false; return false;
} else if(sw != 0x9000) { } else if(sw != 0x9000) {