diff options
Diffstat (limited to 'scd')
| -rw-r--r-- | scd/apdu.c | 2 | ||||
| -rw-r--r-- | scd/pcsc-wrapper.c | 2 | ||||
| -rw-r--r-- | scd/scdaemon.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/scd/apdu.c b/scd/apdu.c index dd45e9968..ffc727c42 100644 --- a/scd/apdu.c +++ b/scd/apdu.c @@ -1833,7 +1833,7 @@ pcsc_vendor_specific_init (int slot) reader_table[slot].is_spr532 = 1; reader_table[slot].pinpad_varlen_supported = 1; } - else if (vendor == 0x046a && product == 0x003e /* Cherry ST-2xxx */ + else if ((vendor == 0x046a && product == 0x003e) /* Cherry ST-2xxx */ || vendor == 0x0c4b /* Tested with Reiner cyberJack GO */ || vendor == 0x1a44 /* Tested with Vasco DIGIPASS 920 */ || vendor == 0x234b /* Tested with FSIJ Gnuk Token */ diff --git a/scd/pcsc-wrapper.c b/scd/pcsc-wrapper.c index 86e4afba5..f39a5dd75 100644 --- a/scd/pcsc-wrapper.c +++ b/scd/pcsc-wrapper.c @@ -53,7 +53,7 @@ /* Allow for a standalone build. */ #ifdef VERSION -#define MYVERSION_LINE PGM " (GnuPG) " VERSION +#define MYVERSION_LINE PGM " ("GNUPG_NAME") " VERSION #define BUGREPORT_LINE "\nReport bugs to <[email protected]>.\n" #else #define MYVERSION_LINE PGM diff --git a/scd/scdaemon.c b/scd/scdaemon.c index 4f9b3695d..daa4eeab3 100644 --- a/scd/scdaemon.c +++ b/scd/scdaemon.c @@ -243,7 +243,7 @@ my_strusage (int level) switch (level) { - case 11: p = "scdaemon (GnuPG)"; + case 11: p = "@SCDAEMON@ (@GNUPG@)"; break; case 13: p = VERSION; break; case 17: p = PRINTABLE_OS_NAME; break; @@ -260,10 +260,10 @@ my_strusage (int level) p = ver_ksba; break; case 1: - case 40: p = _("Usage: scdaemon [options] (-h for help)"); + case 40: p = _("Usage: @SCDAEMON@ [options] (-h for help)"); break; case 41: p = _("Syntax: scdaemon [options] [command [args]]\n" - "Smartcard daemon for GnuPG\n"); + "Smartcard daemon for @GNUPG@\n"); break; default: p = NULL; |