diff options
| author | David Shaw <[email protected]> | 2006-04-19 04:29:31 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2006-04-19 04:29:31 +0000 |
| commit | 36ce455f15a1cae7937f4e848815d3c932dffa45 (patch) | |
| tree | c9abf8efd41195cad8433a08235268bfaea0d362 | |
| parent | * gpg.sgml: Reminders that --cipher-algo, --digest-algo, and (diff) | |
| download | gnupg-36ce455f15a1cae7937f4e848815d3c932dffa45.tar.gz gnupg-36ce455f15a1cae7937f4e848815d3c932dffa45.zip | |
* keyedit.c (menu_backsign): Give some more verbose errors when we
have no need to backsign.
Diffstat (limited to '')
| -rw-r--r-- | g10/ChangeLog | 5 | ||||
| -rw-r--r-- | g10/keyedit.c | 27 |
2 files changed, 26 insertions, 6 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 664f9fe1d..a031ac471 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2006-04-18 David Shaw <[email protected]> + + * keyedit.c (menu_backsign): Give some more verbose errors when we + have no need to backsign. + 2006-04-11 David Shaw <[email protected]> * options.skel, photoid.c (get_default_photo_command): Find an diff --git a/g10/keyedit.c b/g10/keyedit.c index 738c9a658..56e30e5d3 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -3660,10 +3660,21 @@ menu_backsign(KBNODE pub_keyblock,KBNODE sec_keyblock) } /* Find a signing subkey with no backsig */ - if(node->pkt->pkttype==PKT_PUBLIC_SUBKEY - && (node->pkt->pkt.public_key->pubkey_usage&PUBKEY_USAGE_SIG) - && !node->pkt->pkt.public_key->backsig) - sub_pk=node->pkt->pkt.public_key; + if(node->pkt->pkttype==PKT_PUBLIC_SUBKEY) + { + if(node->pkt->pkt.public_key->pubkey_usage&PUBKEY_USAGE_SIG) + { + if(node->pkt->pkt.public_key->backsig) + tty_printf(_("signing subkey %s is already cross-certified\n"), + keystr_from_pk(node->pkt->pkt.public_key)); + else + sub_pk=node->pkt->pkt.public_key; + } + else + tty_printf(_("subkey %s does not sign and so does" + " not need to be cross-certified\n"), + keystr_from_pk(node->pkt->pkt.public_key)); + } if(!sub_pk) continue; @@ -3692,7 +3703,11 @@ menu_backsign(KBNODE pub_keyblock,KBNODE sec_keyblock) } if(!sub_sk) - continue; + { + tty_printf(_("no secret subkey for public subkey %s - ignoring\n"), + keystr_from_pk(sub_pk)); + continue; + } /* Now finally find the matching selfsig on the secret subkey. We can't use chosen_selfsig here (it's not set for secret @@ -3712,7 +3727,7 @@ menu_backsign(KBNODE pub_keyblock,KBNODE sec_keyblock) } /* Now we can get to work. We have a main key and secret part, - a signing subkey with signature and secret part with + a signing subkey with signature and secret part possibly with signature. */ passphrase=get_last_passphrase(); |