mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* 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.
This commit is contained in:
parent
6d4cc84f3c
commit
1e01514529
7 changed files with 67 additions and 59 deletions
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue