summaryrefslogtreecommitdiffstats
path: root/scd/iso7816.h
diff options
context:
space:
mode:
authorNIIBE Yutaka <gniibe@fsij.org>2013-02-07 02:07:51 +0100
committerNIIBE Yutaka <gniibe@fsij.org>2013-02-08 01:06:39 +0100
commit7253093addfd82a8dd25cd80e3ba820a85e3c9a7 (patch)
tree488b69ebe36258731f218ee2168386fe20d18e93 /scd/iso7816.h
parentgpg: Add pinentry-mode feature. (diff)
downloadgnupg2-7253093addfd82a8dd25cd80e3ba820a85e3c9a7.tar.xz
gnupg2-7253093addfd82a8dd25cd80e3ba820a85e3c9a7.zip
scd: Rename 'keypad' to 'pinpad'.
* NEWS: Mention scd changes. * agent/divert-scd.c (getpin_cb): Change message. * agent/call-scd.c (inq_needpin): Change the protocol to POPUPPINPADPROMPT and DISMISSPINPADPROMPT. * scd/command.c (pin_cb): Likewise. * scd/apdu.c (struct reader_table_s): Rename member functions. (check_pcsc_pinpad, pcsc_pinpad_verify, pcsc_pinpad_modify, check_ccid_pinpad, ccid_pinpad_operation, apdu_check_pinpad apdu_pinpad_verify, apdu_pinpad_modify): Rename. * scd/apdu.h (SW_HOST_NO_PINPAD, apdu_check_pinpad) (apdu_pinpad_verify, apdu_pinpad_modify): Rename. * scd/iso7816.h (iso7816_check_pinpad): Rename. * scd/iso7816.c (map_sw): Use SW_HOST_NO_PINPAD. (iso7816_check_pinpad): Rename. (iso7816_verify_kp, iso7816_change_reference_data_kp): Follow the change. * scd/ccid-driver.h (CCID_DRIVER_ERR_NO_PINPAD): Rename. * scd/ccid-driver.c (ccid_transceive_secure): Use it. * scd/app-dinsig.c (verify_pin): Follow the change. * scd/app-nks.c (verify_pin): Follow the change. * scd/app-openpgp.c (check_pinpad_request): Rename. (parse_login_data, verify_a_chv, verify_chv3, do_change_pin): Follow the change. * scd/scdaemon.c (oDisablePinpad, oEnablePinpadVarlen): Rename. * scd/scdaemon.h (opt): Rename to disable_pinpad, enable_pinpad_varlen. * tools/gpgconf-comp.c (gc_options_scdaemon): Rename to disable-pinpad.
Diffstat (limited to 'scd/iso7816.h')
-rw-r--r--scd/iso7816.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/scd/iso7816.h b/scd/iso7816.h
index bf195ea00..6dd1052fe 100644
--- a/scd/iso7816.h
+++ b/scd/iso7816.h
@@ -24,13 +24,13 @@
#include "cardglue.h"
#endif
-/* Command codes used by iso7816_check_keypad. */
+/* Command codes used by iso7816_check_pinpad. */
#define ISO7816_VERIFY 0x20
#define ISO7816_CHANGE_REFERENCE_DATA 0x24
#define ISO7816_RESET_RETRY_COUNTER 0x2C
-/* Information to be passed to keypad equipped readers. See
+/* Information to be passed to pinpad equipped readers. See
ccid-driver.c for details. */
struct pininfo_s
{
@@ -62,7 +62,7 @@ gpg_error_t iso7816_apdu_direct (int slot,
const void *apdudata, size_t apdudatalen,
int handle_more,
unsigned char **result, size_t *resultlen);
-gpg_error_t iso7816_check_keypad (int slot, int command,
+gpg_error_t iso7816_check_pinpad (int slot, int command,
pininfo_t *pininfo);
gpg_error_t iso7816_verify (int slot,
int chvno, const char *chv, size_t chvlen);