From 11573b09c4a00c94107edd40ec84c7de4008151e Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Tue, 17 Jul 2007 18:11:24 +0000
Subject: Typo fixes. Made --default-key work for gpgsm Add --default-key and
 --encrypt-to to gpgconf.

---
 g10/card-util.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'g10/card-util.c')

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";
     }
 }
 
-- 
cgit v1.2.3