security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

* revoke.c (export_minimal_pk), export.c (do_export_stream), passphrase.c

Browse source 
(passphrase_to_dek), keyserver.c (print_keyrec): A few more places to use
--keyid-format.

* options.h, g10.c (main), export.c (parse_export_options,
do_export_stream): Remove --export-all and the "include-non-rfc"
export-option as they are no longer meaningful with the removal of v3
Elgamal keys.
This commit is contained in:
David Shaw 2004-03-05 00:01:25 +00:00
parent 6d4cc84f3c
commit 1e01514529
7 changed files with 67 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

13
g10/keyserver.c
View file

@ -276,13 +276,20 @@ print_keyrec(int number,struct keyrec *keyrec)
switch(keyrec->desc.mode)
{
/* If the keyserver helper gave us a short keyid, we have no
choice but to use it. Do check --keyid-format to add a 0x if
needed. */
case KEYDB_SEARCH_MODE_SHORT_KID:
printf("key %08lX",(ulong)keyrec->desc.u.kid[1]);
printf("key %s%08lX",
(opt.keyid_format==KF_0xSHORT
|| opt.keyid_format==KF_0xLONG)?"0x":"",
(ulong)keyrec->desc.u.kid[1]);
break;
/* However, if it gave us a long keyid, we can honor
--keyid-format */
case KEYDB_SEARCH_MODE_LONG_KID:
printf("key %08lX%08lX",(ulong)keyrec->desc.u.kid[0],
(ulong)keyrec->desc.u.kid[1]);
printf("key %s",keystr(keyrec->desc.u.kid));
break;
case KEYDB_SEARCH_MODE_FPR16: