diff options
| author | David Shaw <[email protected]> | 2004-03-05 00:01:25 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-03-05 00:01:25 +0000 |
| commit | 1e0151452986e42dd201b2b574b5f2d4a001812c (patch) | |
| tree | ff031151969f6a5cb096db1e9b39bd20cd298133 /g10/keyserver.c | |
| parent | * iobuf.c (block_filter): Remove the old gpg indeterminate length mode. (diff) | |
| download | gnupg-1e0151452986e42dd201b2b574b5f2d4a001812c.tar.gz gnupg-1e0151452986e42dd201b2b574b5f2d4a001812c.zip | |
* revoke.c (export_minimal_pk), export.c (do_export_stream), passphrase.c
(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.
Diffstat (limited to '')
| -rw-r--r-- | g10/keyserver.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/g10/keyserver.c b/g10/keyserver.c index 98b5d0c58..e2224d3a0 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -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: |