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/revoke.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 'g10/revoke.c')
-rw-r--r-- | g10/revoke.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/g10/revoke.c b/g10/revoke.c index d33e2f4b7..b973ff6cc 100644 --- a/g10/revoke.c +++ b/g10/revoke.c @@ -1,5 +1,6 @@ /* revoke.c - * Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, + * 2004 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -89,7 +90,7 @@ export_minimal_pk(IOBUF out,KBNODE keyblock, node=find_kbnode(keyblock,PKT_PUBLIC_KEY); if(!node) { - log_error(_("key incomplete\n")); + log_error("key incomplete\n"); return G10ERR_GENERAL; } @@ -142,7 +143,7 @@ export_minimal_pk(IOBUF out,KBNODE keyblock, break; else { - log_error(_("key %08lX incomplete\n"),(ulong)keyid[1]); + log_error(_("key %s has no user IDs\n"),keystr(keyid)); return G10ERR_GENERAL; } } |