Typo fixes.

Made --default-key work for gpgsm
Add --default-key and --encrypt-to to gpgconf.

3 files changed, 14 insertions, 3 deletions

diff --git a/g10/ChangeLog b/g10/ChangeLog
index 86d1da562..68b1eb1fb 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-17  Werner Koch  <[email protected]>
+
+	* gpg.c (gpgconf_list): Declare --encrypt-to and --default-key.
+
+	* card-util.c (get_manufacturer): Add the unmanaged S/N range.
+
 2007-07-12  Werner Koch  <[email protected]>
 
 	* gpg.c (main): Use translate_sys2libc_fd_int when passing an int
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";
     }
 }
 
diff --git a/g10/gpg.c b/g10/gpg.c
index 49c29c992..a0fc17694 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -1467,6 +1467,8 @@ gpgconf_list (const char *configfile)
   printf ("quiet:%lu:\n",   GC_OPT_FLAG_NONE);
   printf ("keyserver:%lu:\n", GC_OPT_FLAG_NONE);
   printf ("reader-port:%lu:\n", GC_OPT_FLAG_NONE);
+  printf ("default-key:%lu:\n", GC_OPT_FLAG_NONE);
+  printf ("encrypt-to:%lu:\n", GC_OPT_FLAG_NONE);
 
   xfree (configfile_esc);
 }