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

let generate use chaining with transfer_data()

Browse Source
This commit is contained in:
Klas Lindfors
2014-02-07 17:11:56 +01:00
parent 4a51550f4b
commit 4c1a692838
1 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yubico-piv-tool.c
+10 -22
View File
@@ -259,8 +259,9 @@ static void print_version(SCARDHANDLE *card, int verbose) {
static bool generate_key(SCARDHANDLE *card, const char *slot, enum enum_algorithm algorithm, static bool generate_key(SCARDHANDLE *card, const char *slot, enum enum_algorithm algorithm,
const char *output_file_name, enum enum_key_format key_format, int verbose) { const char *output_file_name, enum enum_key_format key_format, int verbose) {
APDU apdu; APDU apdu;
unsigned char in_data[5];
unsigned char data[1024]; unsigned char data[1024];
unsigned long recv_len = 0xff; unsigned long recv_len = sizeof(data);
unsigned long received = 0; unsigned long received = 0;
int sw; int sw;
int key = 0; int key = 0;
@@ -288,20 +289,19 @@ static bool generate_key(SCARDHANDLE *card, const char *slot, enum enum_algorith
memset(apdu.raw, 0, sizeof(apdu)); memset(apdu.raw, 0, sizeof(apdu));
apdu.st.ins = 0x47; apdu.st.ins = 0x47;
apdu.st.p2 = key; apdu.st.p2 = key;
apdu.st.lc = 5; in_data[0] = 0xac;
apdu.st.data[0] = 0xac; in_data[1] = 3;
apdu.st.data[1] = 3; in_data[2] = 0x80;
apdu.st.data[2] = 0x80; in_data[3] = 1;
apdu.st.data[3] = 1;
switch(algorithm) { switch(algorithm) {
case algorithm_arg_RSA2048: case algorithm_arg_RSA2048:
apdu.st.data[4] = 0x07; in_data[4] = 0x07;
break; break;
case algorithm_arg_RSA1024: case algorithm_arg_RSA1024:
apdu.st.data[4] = 0x06; in_data[4] = 0x06;
break; break;
case algorithm_arg_ECCP256: case algorithm_arg_ECCP256:
apdu.st.data[4] = 0x11; in_data[4] = 0x11;
break; break;
case algorithm__NULL: case algorithm__NULL:
default: default:
@@ -309,16 +309,8 @@ static bool generate_key(SCARDHANDLE *card, const char *slot, enum enum_algorith
ret = false; ret = false;
goto generate_out; goto generate_out;
} }
sw = send_data(card, &apdu, data, &recv_len, verbose); sw = transfer_data(card, &apdu, in_data, sizeof(in_data), data, &recv_len, verbose);
/* chained response */
if((sw & 0x6100) == 0x6100) {
received += recv_len - 2;
recv_len = 0xff;
memset(apdu.raw, 0, sizeof(apdu));
apdu.st.ins = 0xc0;
sw = send_data(card, &apdu, data + received, &recv_len, verbose);
}
if(sw != 0x9000) { if(sw != 0x9000) {
fprintf(stderr, "Failed to generate new key.\n"); fprintf(stderr, "Failed to generate new key.\n");
ret = false; ret = false;
@@ -989,10 +981,6 @@ static bool request_certificate(SCARDHANDLE *card, enum enum_key_format key_form
M_ASN1_BIT_STRING_set(sig, dataptr, len); M_ASN1_BIT_STRING_set(sig, dataptr, len);
req->signature = sig; req->signature = sig;
fprintf(stderr, "Whole data is: ");
dump_hex(dataptr, len);
fprintf(stderr, "\n");
if(key_format == key_format_arg_PEM) { if(key_format == key_format_arg_PEM) {
PEM_write_X509_REQ(output_file, req); PEM_write_X509_REQ(output_file, req);
} else { } else {