diff options
| author | NIIBE Yutaka <[email protected]> | 2013-01-07 05:20:55 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2013-02-05 04:35:44 +0000 |
| commit | ca89277cb4cb9558da97a71a4cb070cb77c9b536 (patch) | |
| tree | f759a3f1373fc39caf9be2398ccbf18f77301260 /scd/apdu.h | |
| parent | SCD: Add option enable-keypad-varlen and support for GEMPC_PINPAD. (diff) | |
| download | gnupg-ca89277cb4cb9558da97a71a4cb070cb77c9b536.tar.gz gnupg-ca89277cb4cb9558da97a71a4cb070cb77c9b536.zip | |
SCD: Clean up. Remove PADLEN for keypad input.
* scd/apdu.c (struct pininfo_s): Use iso7816_pininfo_s.
(struct reader_table_s): Remove last arg from check_keypad method.
(check_pcsc_keypad, check_pcsc_keypad): Remove PIN_PADLEN.
(pcsc_keypad_verify, pcsc_keypad_modify): Don't check PIN_PADLEN.
(send_apdu_ccid, ccid_keypad_operation): Remove PIN_PADLEN.
(apdu_check_keypad, apdu_keypad_verify, apdu_keypad_modify):
Likewise.
* scd/apdu.h (apdu_check_keypad, apdu_keypad_verify)
(apdu_keypad_modify): Remove PIN_PADLEN.
* scd/ccid-driver.c (ccid_transceive_secure): Remove PIN_PADLEN.
* scd/ccid-driver.h (ccid_transceive_secure): Remove PIN_PADLEN.
* scd/iso7816.c (iso7816_check_keypad, iso7816_verify_kp)
(iso7816_change_reference_data_kp): Remove PADLEN.
* scd/iso7816.h (struct iso7816_pininfo_s): Remove PADLEN, PADCHAR.
--
In the OpenPGPcard specification, password comes with no padding. In
GnuPG, we support keypad input for OpenPGPcard only. Thus, it is
useless to try to support padding for keypad input.
Diffstat (limited to 'scd/apdu.h')
| -rw-r--r-- | scd/apdu.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/scd/apdu.h b/scd/apdu.h index bf5534634..6bf617674 100644 --- a/scd/apdu.h +++ b/scd/apdu.h @@ -115,13 +115,11 @@ int apdu_reset (int slot); int apdu_get_status (int slot, int hang, unsigned int *status, unsigned int *changed); int apdu_check_keypad (int slot, int command, int pin_mode, - int pinlen_min, int pinlen_max, int pin_padlen); + int pinlen_min, int pinlen_max); int apdu_keypad_verify (int slot, int class, int ins, int p0, int p1, - int pin_mode, int pinlen_min, int pinlen_max, - int pin_padlen); + int pin_mode, int pinlen_min, int pinlen_max); int apdu_keypad_modify (int slot, int class, int ins, int p0, int p1, - int pin_mode, int pinlen_min, int pinlen_max, - int pin_padlen); + int pin_mode, int pinlen_min, int pinlen_max); int apdu_send_simple (int slot, int extended_mode, int class, int ins, int p0, int p1, int lc, const char *data); |