security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

scd: change default value of pinpad maxlen.

Browse Source 
* scd/apdu.c (pcsc_pinpad_verify, pcsc_pinpad_modify): Default value
of maxlen for pinpad input is now 15 (was: 25).

* scd/ccid-driver.c (ccid_transceive_secure): Likewise.

--

For newer PC/SC, it is better to use FEATURE_GET_TLV_PROPERTIES to get
bMaxPINSize.
This commit is contained in:
NIIBE Yutaka 2013-03-21 09:04:13 +09:00
parent eaa6dc3a8b
commit ca66f5c779
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scd/apdu.c
View File

@ -2056,7 +2056,7 @@ pcsc_pinpad_verify (int slot, int class, int ins, int p0, int p1,
if (!pininfo->minlen) if (!pininfo->minlen)
pininfo->minlen = 1; pininfo->minlen = 1;
if (!pininfo->maxlen) if (!pininfo->maxlen)
pininfo->maxlen = 25; pininfo->maxlen = 15;
/* Note that the 25 is the maximum value the SPR532 allows. */ /* Note that the 25 is the maximum value the SPR532 allows. */
if (pininfo->minlen < 1 || pininfo->minlen > 25 if (pininfo->minlen < 1 || pininfo->minlen > 25
@ -2139,7 +2139,7 @@ pcsc_pinpad_modify (int slot, int class, int ins, int p0, int p1,
if (!pininfo->minlen) if (!pininfo->minlen)
pininfo->minlen = 1; pininfo->minlen = 1;
if (!pininfo->maxlen) if (!pininfo->maxlen)
pininfo->maxlen = 25; pininfo->maxlen = 15;
/* Note that the 25 is the maximum value the SPR532 allows. */ /* Note that the 25 is the maximum value the SPR532 allows. */
if (pininfo->minlen < 1 || pininfo->minlen > 25 if (pininfo->minlen < 1 || pininfo->minlen > 25

7
scd/ccid-driver.c
View File

@ -3357,7 +3357,7 @@ ccid_transceive_secure (ccid_driver_t handle,
if (!pininfo->minlen) if (!pininfo->minlen)
pininfo->minlen = 1; pininfo->minlen = 1;
if (!pininfo->maxlen) if (!pininfo->maxlen)
pininfo->maxlen = 25; pininfo->maxlen = 15;
/* Note that the 25 is the maximum value the SPR532 allows. */ /* Note that the 25 is the maximum value the SPR532 allows. */
if (pininfo->minlen < 1 || pininfo->minlen > 25 if (pininfo->minlen < 1 || pininfo->minlen > 25
@ -3371,14 +3371,15 @@ ccid_transceive_secure (ccid_driver_t handle,
{ {
case VENDOR_SCM: /* Tested with SPR 532. */ case VENDOR_SCM: /* Tested with SPR 532. */
case VENDOR_KAAN: /* Tested with KAAN Advanced (1.02). */ case VENDOR_KAAN: /* Tested with KAAN Advanced (1.02). */
case VENDOR_FSIJ: /* Tested with the gnuk code (2011-01-05). */ case VENDOR_FSIJ: /* Tested with Gnuk (0.21). */
pininfo->maxlen = 25;
enable_varlen = 1; enable_varlen = 1;
break; break;
case VENDOR_VASCO: /* Tested with DIGIPASS 920 */ case VENDOR_VASCO: /* Tested with DIGIPASS 920 */
enable_varlen = 1; enable_varlen = 1;
pininfo->maxlen = 15;
break; break;
case VENDOR_CHERRY: case VENDOR_CHERRY:
pininfo->maxlen = 25;
enable_varlen = 1; enable_varlen = 1;
/* The CHERRY XX44 keyboard echos an asterisk for each entered /* The CHERRY XX44 keyboard echos an asterisk for each entered
character on the keyboard channel. We use a special variant character on the keyboard channel. We use a special variant