mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
Typo fixes.
Made --default-key work for gpgsm Add --default-key and --encrypt-to to gpgconf.
This commit is contained in:
parent
2d4e157d85
commit
11573b09c4
13 changed files with 70 additions and 14 deletions
|
@ -1,3 +1,9 @@
|
|||
2007-07-17 Werner Koch <wk@g10code.com>
|
||||
|
||||
* 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 <wk@g10code.com>
|
||||
|
||||
* gpg.c (main): Use translate_sys2libc_fd_int when passing an int
|
||||
|
|
|
@ -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";
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue