aboutsummaryrefslogtreecommitdiffstats
path: root/g10/card-util.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2007-07-17 18:11:24 +0000
committerWerner Koch <[email protected]>2007-07-17 18:11:24 +0000
commit11573b09c4a00c94107edd40ec84c7de4008151e (patch)
treec98e84d1c790a82ec0e94be1b7d86f7cbb24981f /g10/card-util.c
parent2007-07-16 Marcus Brinkmann <[email protected]> (diff)
downloadgnupg-11573b09c4a00c94107edd40ec84c7de4008151e.tar.gz
gnupg-11573b09c4a00c94107edd40ec84c7de4008151e.zip
Typo fixes.
Made --default-key work for gpgsm Add --default-key and --encrypt-to to gpgconf.
Diffstat (limited to '')
-rw-r--r--g10/card-util.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/g10/card-util.c b/g10/card-util.c
index 751f700ea..d53edc55e 100644
--- a/g10/card-util.c
+++ b/g10/card-util.c
@@ -153,12 +153,15 @@ 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";
+ /* 0x00000 and 0xFFFF are defined as test cards per spec,
+ 0xFFF00 to 0xFFFE are assigned for use with randomly created
+ serial numbers. */
+ case 0x0000:
+ case 0xffff: return "test card";
+ default: return (no & 0xff00) == 0xff00? "unmanaged S/N range":"unknown";
}
}