mirror of
git://git.gnupg.org/gnupg.git
synced 2025-01-18 14:17:03 +01:00
Fix pinpad entry in ccid-driver.
* scd/ccid-driver.c (ccid_transceive_secure): Let it have three messages, always. Fixe bMsgIndex1-3.
This commit is contained in:
parent
fb01522af7
commit
ce4bdfd46b
@ -3214,7 +3214,7 @@ ccid_transceive_secure (ccid_driver_t handle,
|
|||||||
if (apdu_buf[1] == 0x20)
|
if (apdu_buf[1] == 0x20)
|
||||||
msg[msglen++] = 0xff; /* bNumberMessage: Default. */
|
msg[msglen++] = 0xff; /* bNumberMessage: Default. */
|
||||||
else
|
else
|
||||||
msg[msglen++] = apdu_buf[2] == 0 ? 0x03 : 0x01; /* bNumberMessage. */
|
msg[msglen++] = 0x03; /* bNumberMessage. */
|
||||||
|
|
||||||
msg[msglen++] = 0x09; /* wLangId-Low: English FIXME: use the first entry. */
|
msg[msglen++] = 0x09; /* wLangId-Low: English FIXME: use the first entry. */
|
||||||
msg[msglen++] = 0x04; /* wLangId-High. */
|
msg[msglen++] = 0x04; /* wLangId-High. */
|
||||||
@ -3223,12 +3223,9 @@ ccid_transceive_secure (ccid_driver_t handle,
|
|||||||
msg[msglen++] = 0; /* bMsgIndex. */
|
msg[msglen++] = 0; /* bMsgIndex. */
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
msg[msglen++] = 1; /* bMsgIndex1. */
|
msg[msglen++] = 0; /* bMsgIndex1. */
|
||||||
if (apdu_buf[2] == 0)
|
msg[msglen++] = 1; /* bMsgIndex2. */
|
||||||
{
|
msg[msglen++] = 2; /* bMsgIndex3. */
|
||||||
msg[msglen++] = 2; /* bMsgIndex2. */
|
|
||||||
msg[msglen++] = 3; /* bMsgIndex3. */
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* bTeoProlog follows: */
|
/* bTeoProlog follows: */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user