security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-06 17:23:03 +01:00
Code Activity

Support keypad_modify method by ccid-driver.

Browse Source 
* apdu.c (ccid_keypad_operation): Rename from ccid_keypad_verify.
(open_ccid_reader): Use ccid_keypad_operation for verify and modify.

* ccid-driver.c (ccid_transceive_secure): Support
CHANGE_REFERENCE_DATA: 0x24.
This commit is contained in:
NIIBE Yutaka 2011-12-05 13:57:42 +09:00
parent 37fadead90
commit fb01522af7
2 changed files with 58 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scd/apdu.c
View File

@ -2336,8 +2336,8 @@ check_ccid_keypad (int slot, int command, int pin_mode,
static int static int
ccid_keypad_verify (int slot, int class, int ins, int p0, int p1, ccid_keypad_operation (int slot, int class, int ins, int p0, int p1,
struct pininfo_s *pininfo) struct pininfo_s *pininfo)
{ {
unsigned char apdu[4]; unsigned char apdu[4];
int err, sw; int err, sw;
@ -2408,8 +2408,8 @@ open_ccid_reader (const char *portstr)
reader_table[slot].check_keypad = check_ccid_keypad; reader_table[slot].check_keypad = check_ccid_keypad;
reader_table[slot].dump_status_reader = dump_ccid_reader_status; reader_table[slot].dump_status_reader = dump_ccid_reader_status;
reader_table[slot].set_progress_cb = set_progress_cb_ccid_reader; reader_table[slot].set_progress_cb = set_progress_cb_ccid_reader;
reader_table[slot].keypad_verify = ccid_keypad_verify; reader_table[slot].keypad_verify = ccid_keypad_operation;
reader_table[slot].keypad_modify = NULL; reader_table[slot].keypad_modify = ccid_keypad_operation;
/* Our CCID reader code does not support T=0 at all, thus reset the /* Our CCID reader code does not support T=0 at all, thus reset the
flag. */ flag. */
reader_table[slot].is_t0 = 0; reader_table[slot].is_t0 = 0;

74
scd/ccid-driver.c
View File

@ -3102,7 +3102,7 @@ ccid_transceive_secure (ccid_driver_t handle,
if (apdu_buflen >= 4 && apdu_buf[1] == 0x20 && (handle->has_pinpad & 1)) if (apdu_buflen >= 4 && apdu_buf[1] == 0x20 && (handle->has_pinpad & 1))
; ;
else if (apdu_buflen >= 4 && apdu_buf[1] == 0x24 && (handle->has_pinpad & 2)) else if (apdu_buflen >= 4 && apdu_buf[1] == 0x24 && (handle->has_pinpad & 2))
return CCID_DRIVER_ERR_NOT_SUPPORTED; /* Not yet by our code. */ ;
else else
return CCID_DRIVER_ERR_NO_KEYPAD; return CCID_DRIVER_ERR_NO_KEYPAD;
@ -3165,7 +3165,8 @@ ccid_transceive_secure (ccid_driver_t handle,
msg[7] = 0; /* bBWI */ msg[7] = 0; /* bBWI */
msg[8] = 0; /* RFU */ msg[8] = 0; /* RFU */
msg[9] = 0; /* RFU */ msg[9] = 0; /* RFU */
msg[10] = 0; /* Perform PIN verification. */ msg[10] = apdu_buf[1] == 0x20 ? 0 : 1;
/* Perform PIN verification or PIN modification. */
msg[11] = 0; /* Timeout in seconds. */ msg[11] = 0; /* Timeout in seconds. */
msg[12] = 0x82; /* bmFormatString: Byte, pos=0, left, ASCII. */ msg[12] = 0x82; /* bmFormatString: Byte, pos=0, left, ASCII. */
if (handle->id_vendor == VENDOR_SCM) if (handle->id_vendor == VENDOR_SCM)
@ -3184,28 +3185,61 @@ ccid_transceive_secure (ccid_driver_t handle,
Units are bytes, position is 0. */ Units are bytes, position is 0. */
} }
/* The following is a little endian word. */ msglen = 15;
msg[15] = pinlen_max; /* wPINMaxExtraDigit-Maximum. */ if (apdu_buf[1] == 0x24)
msg[16] = pinlen_min; /* wPINMaxExtraDigit-Minimum. */ {
msg[msglen++] = 0; /* bInsertionOffsetOld */
msg[msglen++] = 0; /* bInsertionOffsetNew */
}
msg[17] = 0x02; /* bEntryValidationCondition: /* The following is a little endian word. */
Validation key pressed */ msg[msglen++] = pinlen_max; /* wPINMaxExtraDigit-Maximum. */
msg[msglen++] = pinlen_min; /* wPINMaxExtraDigit-Minimum. */
if (apdu_buf[1] == 0x24)
msg[msglen++] = apdu_buf[2] == 0 ? 0x03 : 0x01;
/* bConfirmPIN
* 0x00: new PIN once
* 0x01: new PIN twice (confirmation)
* 0x02: old PIN and new PIN once
* 0x03: old PIN and new PIN twice (confirmation)
*/
msg[msglen] = 0x02; /* bEntryValidationCondition:
Validation key pressed */
if (pinlen_min && pinlen_max && pinlen_min == pinlen_max) if (pinlen_min && pinlen_max && pinlen_min == pinlen_max)
msg[17] |= 0x01; /* Max size reached. */ msg[msglen] |= 0x01; /* Max size reached. */
msg[18] = 0xff; /* bNumberMessage: Default. */ msglen++;
msg[19] = 0x09; /* wLangId-Low: English FIXME: use the first entry. */
msg[20] = 0x04; /* wLangId-High. */ if (apdu_buf[1] == 0x20)
msg[21] = 0; /* bMsgIndex. */ msg[msglen++] = 0xff; /* bNumberMessage: Default. */
else
msg[msglen++] = apdu_buf[2] == 0 ? 0x03 : 0x01; /* bNumberMessage. */
msg[msglen++] = 0x09; /* wLangId-Low: English FIXME: use the first entry. */
msg[msglen++] = 0x04; /* wLangId-High. */
if (apdu_buf[1] == 0x20)
msg[msglen++] = 0; /* bMsgIndex. */
else
{
msg[msglen++] = 1; /* bMsgIndex1. */
if (apdu_buf[2] == 0)
{
msg[msglen++] = 2; /* bMsgIndex2. */
msg[msglen++] = 3; /* bMsgIndex3. */
}
}
/* bTeoProlog follows: */ /* bTeoProlog follows: */
msg[22] = handle->nonnull_nad? ((1 << 4) | 0): 0; msg[msglen++] = handle->nonnull_nad? ((1 << 4) | 0): 0;
msg[23] = ((handle->t1_ns & 1) << 6); /* I-block */ msg[msglen++] = ((handle->t1_ns & 1) << 6); /* I-block */
msg[24] = 0; /* The apdulen will be filled in by the reader. */ msg[msglen++] = 0; /* The apdulen will be filled in by the reader. */
/* APDU follows: */ /* APDU follows: */
msg[25] = apdu_buf[0]; /* CLA */ msg[msglen++] = apdu_buf[0]; /* CLA */
msg[26] = apdu_buf[1]; /* INS */ msg[msglen++] = apdu_buf[1]; /* INS */
msg[27] = apdu_buf[2]; /* P1 */ msg[msglen++] = apdu_buf[2]; /* P1 */
msg[28] = apdu_buf[3]; /* P2 */ msg[msglen++] = apdu_buf[3]; /* P2 */
msglen = 29;
if (cherry_mode) if (cherry_mode)
msg[msglen++] = 0; msg[msglen++] = 0;
/* An EDC is not required. */ /* An EDC is not required. */