diff options
| author | Werner Koch <[email protected]> | 2013-02-12 18:17:42 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2013-02-12 18:17:42 +0000 |
| commit | caddeef4a7ffe5f2eb6453d364b6ae152e0f6625 (patch) | |
| tree | 5894e3f0e365b0c9035efecea2bbd5ad3042ca51 /scd/scdaemon.h | |
| parent | kbx: Switch from MD5 to SHA-1 for the checksum. (diff) | |
| parent | gpg: Implement card_store_subkey again. (diff) | |
| download | gnupg-caddeef4a7ffe5f2eb6453d364b6ae152e0f6625.tar.gz gnupg-caddeef4a7ffe5f2eb6453d364b6ae152e0f6625.zip | |
Merge branch 'master' into key-storage-work
Diffstat (limited to '')
| -rw-r--r-- | scd/scdaemon.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scd/scdaemon.h b/scd/scdaemon.h index 74e8b7d44..ab63425d8 100644 --- a/scd/scdaemon.h +++ b/scd/scdaemon.h @@ -56,7 +56,8 @@ struct const char *pcsc_driver; /* Library to access the PC/SC system. */ const char *reader_port; /* NULL or reder port to use. */ int disable_ccid; /* Disable the use of the internal CCID driver. */ - int disable_keypad; /* Do not use a keypad. */ + int disable_pinpad; /* Do not use a pinpad. */ + int enable_pinpad_varlen; /* Use variable length input for pinpad. */ int allow_admin; /* Allow the use of admin commands for certain cards. */ strlist_t disabled_applications; /* Card applications we do not |