diff options
| author | NIIBE Yutaka <[email protected]> | 2013-11-13 07:43:26 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2013-11-13 07:47:39 +0000 |
| commit | f72d9a5cf69c3e719979547a5f7a37efe49bd642 (patch) | |
| tree | 47d9720d589693ea30058c8ed60b511c726387b3 | |
| parent | scd: more pinpad fix. (diff) | |
| download | gnupg-f72d9a5cf69c3e719979547a5f7a37efe49bd642.tar.gz gnupg-f72d9a5cf69c3e719979547a5f7a37efe49bd642.zip | |
scd: more pinpad input fix for PC/SC.
* scd/apdu.c (check_pcsc_pinpad): Set default values here.
(pcsc_pinpad_verify, pcsc_pinpad_modify): Remove setting default
values, as it's too late.
--
cherry picked from master.
| -rw-r--r-- | scd/apdu.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/scd/apdu.c b/scd/apdu.c index 49ece0b9a..67671b2a8 100644 --- a/scd/apdu.c +++ b/scd/apdu.c @@ -2212,6 +2212,11 @@ check_pcsc_pinpad (int slot, int command, pininfo_t *pininfo) if (reader_table[slot].pcsc.pinmax >= 0) pininfo->maxlen = reader_table[slot].pcsc.pinmax; + if (!pininfo->minlen) + pininfo->minlen = 1; + if (!pininfo->maxlen) + pininfo->maxlen = 15; + if ((command == ISO7816_VERIFY && reader_table[slot].pcsc.verify_ioctl != 0) || (command == ISO7816_CHANGE_REFERENCE_DATA && reader_table[slot].pcsc.modify_ioctl != 0)) @@ -2248,11 +2253,6 @@ pcsc_pinpad_verify (int slot, int class, int ins, int p0, int p1, if (pininfo->fixedlen < 0 || pininfo->fixedlen >= 16) return SW_NOT_SUPPORTED; - if (!pininfo->minlen) - pininfo->minlen = 1; - if (!pininfo->maxlen) - pininfo->maxlen = 15; - pin_verify = xtrymalloc (len); if (!pin_verify) return SW_HOST_OUT_OF_CORE; @@ -2328,11 +2328,6 @@ pcsc_pinpad_modify (int slot, int class, int ins, int p0, int p1, if (pininfo->fixedlen < 0 || pininfo->fixedlen >= 16) return SW_NOT_SUPPORTED; - if (!pininfo->minlen) - pininfo->minlen = 1; - if (!pininfo->maxlen) - pininfo->maxlen = 15; - pin_modify = xtrymalloc (len); if (!pin_modify) return SW_HOST_OUT_OF_CORE; |