diff options
| -rw-r--r-- | g10/ChangeLog | 5 | ||||
| -rw-r--r-- | g10/card-util.c | 11 |
2 files changed, 13 insertions, 3 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index c4170a522..d7823bf00 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2008-01-26 Werner Koch <[email protected]> + + * card-util.c (get_manufacturer): Add vendor 004 and support for + the unmanaged range. + 2007-12-14 Werner Koch <[email protected]> * gpg.c (main): Set opt.no_homedir_creation already on the first diff --git a/g10/card-util.c b/g10/card-util.c index 0ada8fa94..07d8ddad4 100644 --- a/g10/card-util.c +++ b/g10/card-util.c @@ -152,12 +152,17 @@ get_manufacturer (unsigned int no) /* Note: Make sure that there is no colon or linefeed in the string. */ switch (no) { - case 0: - case 0xffff: return "test card"; case 0x0001: return "PPC Card Systems"; case 0x0002: return "Prism"; case 0x0003: return "OpenFortress"; - default: return "unknown"; + 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. */ + case 0: + case 0xffff: return "test card"; + default: return (no & 0xff00) == 0xff00? "unmanaged S/N range":"unknown"; } } |