deon/gnuk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes two bugs

Browse Source
This commit is contained in:
NIIBE Yutaka
2012-01-19 14:23:01 +09:00
parent 87e4fd50c1
commit 5a868661a9
3 changed files with 51 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
2012-01-19 Niibe Yutaka <gniibe@fsij.org>
* src/usb-icc.c (icc_handle_data): Handle the case when it only
sends 0x90 and 0x00 correctly.
* src/openpgp-do.c (gpg_do_get_data): Fix res_apdu_data_len.
2012-01-18 Niibe Yutaka <gniibe@fsij.org> 2012-01-18 Niibe Yutaka <gniibe@fsij.org>
Clean up API between application layer and CCID layer. Clean up API between application layer and CCID layer.

5
src/openpgp-do.c
View File

@@ -1253,7 +1253,10 @@ gpg_do_get_data (uint16_t tag, int with_tag)
apdu.res_apdu_data = &ch_certificate_start; apdu.res_apdu_data = &ch_certificate_start;
apdu.res_apdu_data_len = ((apdu.res_apdu_data[2] << 8) | apdu.res_apdu_data[3]); apdu.res_apdu_data_len = ((apdu.res_apdu_data[2] << 8) | apdu.res_apdu_data[3]);
if (apdu.res_apdu_data_len == 0xffff) if (apdu.res_apdu_data_len == 0xffff)
GPG_NO_RECORD (); {
apdu.res_apdu_data_len = 0;
GPG_NO_RECORD ();
}
else else
/* Add length of (tag+len) */ /* Add length of (tag+len) */
apdu.res_apdu_data_len += 4; apdu.res_apdu_data_len += 4;

62
src/usb-icc.c
View File

@@ -734,17 +734,44 @@ icc_handle_data (void)
int len = apdu.res_apdu_data_len; int len = apdu.res_apdu_data_len;
if (apdu.res_apdu_data == NULL) if (apdu.res_apdu_data == NULL)
{ /* send last byte of 0x9000 */ { /* send status word(s) of 0x9000 */
icc_buffer[ICC_MSG_HEADER_SIZE] = 0x00; len = 0;
len = 1;
if (apdu.res_apdu_data_len == 2)
{
icc_buffer[ICC_MSG_HEADER_SIZE] = 0x90;
len++;
}
icc_buffer[ICC_MSG_HEADER_SIZE+len] = 0x00;
len++;
} }
else if (apdu.res_apdu_data != &icc_buffer[ICC_MSG_HEADER_SIZE]) else if (apdu.res_apdu_data != &icc_buffer[ICC_MSG_HEADER_SIZE])
{ {
if (apdu.res_apdu_data_len >= ICC_RESPONSE_MSG_DATA_SIZE) if (apdu.res_apdu_data_len > ICC_RESPONSE_MSG_DATA_SIZE)
{ {
memcpy (&icc_buffer[ICC_MSG_HEADER_SIZE], memcpy (&icc_buffer[ICC_MSG_HEADER_SIZE],
apdu.res_apdu_data, ICC_RESPONSE_MSG_DATA_SIZE); apdu.res_apdu_data, ICC_RESPONSE_MSG_DATA_SIZE);
apdu.res_apdu_data += ICC_RESPONSE_MSG_DATA_SIZE; apdu.res_apdu_data += ICC_RESPONSE_MSG_DATA_SIZE;
apdu.res_apdu_data_len -= ICC_RESPONSE_MSG_DATA_SIZE;
}
else if (apdu.res_apdu_data_len == ICC_RESPONSE_MSG_DATA_SIZE)
{
memcpy (&icc_buffer[ICC_MSG_HEADER_SIZE],
apdu.res_apdu_data, ICC_RESPONSE_MSG_DATA_SIZE);
apdu.res_apdu_data = NULL;
apdu.res_apdu_data_len = 2;
}
else if (apdu.res_apdu_data_len
== ICC_RESPONSE_MSG_DATA_SIZE - 1)
{
memcpy (&icc_buffer[ICC_MSG_HEADER_SIZE],
apdu.res_apdu_data, apdu.res_apdu_data_len);
icc_buffer[ICC_MSG_HEADER_SIZE+apdu.res_apdu_data_len]
= 0x90;
apdu.res_apdu_data = NULL;
apdu.res_apdu_data_len = 1;
len += 1;
} }
else if (apdu.res_apdu_data_len else if (apdu.res_apdu_data_len
<= ICC_RESPONSE_MSG_DATA_SIZE - 2) <= ICC_RESPONSE_MSG_DATA_SIZE - 2)
@@ -756,24 +783,18 @@ icc_handle_data (void)
icc_buffer[ICC_MSG_HEADER_SIZE+apdu.res_apdu_data_len+1] icc_buffer[ICC_MSG_HEADER_SIZE+apdu.res_apdu_data_len+1]
= 0x00; = 0x00;
apdu.res_apdu_data = NULL; apdu.res_apdu_data = NULL;
apdu.res_apdu_data_len = 0;
len += 2; len += 2;
} }
else if (apdu.res_apdu_data_len
== ICC_RESPONSE_MSG_DATA_SIZE - 1)
{
memcpy (&icc_buffer[ICC_MSG_HEADER_SIZE],
apdu.res_apdu_data, apdu.res_apdu_data_len);
icc_buffer[ICC_MSG_HEADER_SIZE+apdu.res_apdu_data_len]
= 0x90;
apdu.res_apdu_data = NULL;
len += 1;
}
} }
else else
memmove (&icc_buffer[ICC_MSG_HEADER_SIZE], {
&icc_buffer[ICC_MSG_HEADER_SIZE] memmove (&icc_buffer[ICC_MSG_HEADER_SIZE],
+ICC_RESPONSE_MSG_DATA_SIZE, &icc_buffer[ICC_MSG_HEADER_SIZE]
apdu.res_apdu_data_len); +ICC_RESPONSE_MSG_DATA_SIZE,
apdu.res_apdu_data_len);
apdu.res_apdu_data_len -= ICC_RESPONSE_MSG_DATA_SIZE;
}
if (len <= ICC_RESPONSE_MSG_DATA_SIZE) if (len <= ICC_RESPONSE_MSG_DATA_SIZE)
{ {
@@ -781,10 +802,7 @@ icc_handle_data (void)
next_state = ICC_STATE_WAIT; next_state = ICC_STATE_WAIT;
} }
else else
{ icc_send_data_block (ICC_RESPONSE_MSG_DATA_SIZE, 0, 0x03);
icc_send_data_block (ICC_RESPONSE_MSG_DATA_SIZE, 0, 0x03);
apdu.res_apdu_data_len -= ICC_RESPONSE_MSG_DATA_SIZE;
}
} }
else else
{ {