mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* getkey.c (premerge_public_with_secret): Made "no secret subkey for"
warning a verbose item and translatable. (From wk on stable branch) * sig-check.c (check_key_signature2): Made "no subkey for subkey binding packet" a verbose item instead of a !quiet one. There are too many garbled keys out in the wild. (From wk on stable branch) * filter.h: Remove const from WHAT. (From wk on stable branch) * progress.c (handle_progress): Store a copy of NAME. (progress_filter): Release WHAT, make sure not to print a NULL WHAT. (From wk on stable branch) * openfile.c (open_sigfile): Adjust free for new progress semantics. (From wk on stable branch) * plaintext.c (ask_for_detached_datafile): Don't dealloc pfx->WHAT. (From wk on stable branch) * seckey-cert.c (do_check): Issue the RSA_OR_IDEA status when the cipher algo is IDEA to make it easier to track down the problem. (From twoaday on stable branch)
This commit is contained in:
parent
951f7d9eca
commit
ad9f6ae4b5
8 changed files with 54 additions and 19 deletions
|
@ -2068,8 +2068,9 @@ premerge_public_with_secret ( KBNODE pubblock, KBNODE secblock )
|
|||
if ( !sec ) {
|
||||
KBNODE next, ll;
|
||||
|
||||
log_info ( "no secret subkey "
|
||||
"for public subkey %08lX - ignoring\n",
|
||||
if (opt.verbose)
|
||||
log_info ( _("no secret subkey "
|
||||
"for public subkey %08lX - ignoring\n"),
|
||||
(ulong)keyid_from_pk (pk,NULL) );
|
||||
/* we have to remove the subkey in this case */
|
||||
assert ( last );
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue