diff options
Diffstat (limited to '')
| -rw-r--r-- | g10/ChangeLog | 8 | ||||
| -rw-r--r-- | g10/card-util.c | 2 | ||||
| -rw-r--r-- | g10/gpg.c | 1 |
3 files changed, 11 insertions, 0 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 90cf9003b..af90bd715 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,11 @@ +2008-01-26 Werner Koch <[email protected]> + + * card-util.c (get_manufacturer): Add vendor 0004. + +2008-01-02 Werner Koch <[email protected]> + + * gpg.c: Add --logger-file as an alias for log-file. + 2007-12-14 Werner Koch <[email protected]> * gpg.c (main): Set opt.no_homedir_creation during the first option diff --git a/g10/card-util.c b/g10/card-util.c index d53edc55e..2778bb871 100644 --- a/g10/card-util.c +++ b/g10/card-util.c @@ -156,6 +156,8 @@ get_manufacturer (unsigned int no) case 0x0001: return "PPC Card Systems"; case 0x0002: return "Prism"; case 0x0003: return "OpenFortress"; + case 0x0004: return "Wewid AB"; + /* 0x00000 and 0xFFFF are defined as test cards per spec, 0xFFF00 to 0xFFFE are assigned for use with randomly created serial numbers. */ @@ -623,6 +623,7 @@ static ARGPARSE_OPTS opts[] = { { oLockNever, "lock-never", 0, "@" }, { oLoggerFD, "logger-fd",1, "@" }, { oLoggerFile, "log-file",2, "@" }, + { oLoggerFile, "logger-file",2, "@" }, /* For 1.4 compatibility. */ { oUseEmbeddedFilename, "use-embedded-filename", 0, "@" }, { oNoUseEmbeddedFilename, "no-use-embedded-filename", 0, "@" }, { oUtf8Strings, "utf8-strings", 0, "@" }, |