mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
Some minor bug fixes.
do not prompt for revocation reason for v3 revocations (unless force-v4-certs is on) since they wouldn't be used anyway. show the status of the sigs (exportable? revocable?) to the user before prompting for which sig to revoke. Also, make sure that local signatures get local revocations. Add "exec-path" variable to override PATH for execing programs. properly check return code from classify_user_id to catch unclassifiable keys.
This commit is contained in:
parent
bbf4faae1a
commit
9267666d78
5 changed files with 64 additions and 17 deletions
|
@ -2328,8 +2328,13 @@ ask_revoke_sig( KBNODE keyblock, KBNODE node )
|
|||
tty_printf(_("user ID: \""));
|
||||
tty_print_utf8_string( unode->pkt->pkt.user_id->name,
|
||||
unode->pkt->pkt.user_id->len );
|
||||
tty_printf(_("\"\nsigned with your key %08lX at %s\n"),
|
||||
(ulong)sig->keyid[1], datestr_from_sig(sig) );
|
||||
|
||||
if(sig->flags.exportable)
|
||||
tty_printf(_("\"\nsigned with your key %08lX at %s\n"),
|
||||
(ulong)sig->keyid[1], datestr_from_sig(sig) );
|
||||
else
|
||||
tty_printf(_("\"\nlocally signed with your key %08lX at %s\n"),
|
||||
(ulong)sig->keyid[1], datestr_from_sig(sig) );
|
||||
|
||||
if( cpr_get_answer_is_yes("ask_revoke_sig.one",
|
||||
_("Create a revocation certificate for this signature? (y/N)")) ) {
|
||||
|
@ -2370,9 +2375,10 @@ menu_revsig( KBNODE keyblock )
|
|||
&& ((sig = node->pkt->pkt.signature),
|
||||
!seckey_available(sig->keyid) ) ) {
|
||||
if( (sig->sig_class&~3) == 0x10 ) {
|
||||
tty_printf(_(" signed by %08lX at %s%s\n"),
|
||||
(ulong)sig->keyid[1], datestr_from_sig(sig),
|
||||
sig->flags.revocable?"":" (not revocable)");
|
||||
tty_printf(_(" signed by %08lX at %s%s%s\n"),
|
||||
(ulong)sig->keyid[1], datestr_from_sig(sig),
|
||||
sig->flags.exportable?"":" (non-exportable)",
|
||||
sig->flags.revocable?"":" (non-revocable)");
|
||||
if(sig->flags.revocable)
|
||||
node->flag |= NODFLG_SELSIG;
|
||||
}
|
||||
|
@ -2407,8 +2413,9 @@ menu_revsig( KBNODE keyblock )
|
|||
}
|
||||
else if( node->pkt->pkttype == PKT_SIGNATURE ) {
|
||||
sig = node->pkt->pkt.signature;
|
||||
tty_printf(_(" signed by %08lX at %s\n"),
|
||||
(ulong)sig->keyid[1], datestr_from_sig(sig) );
|
||||
tty_printf(_(" signed by %08lX at %s%s\n"),
|
||||
(ulong)sig->keyid[1], datestr_from_sig(sig),
|
||||
sig->flags.exportable?"":_(" (non-exportable)") );
|
||||
}
|
||||
}
|
||||
if( !any )
|
||||
|
@ -2440,6 +2447,7 @@ menu_revsig( KBNODE keyblock )
|
|||
|
||||
memset( &attrib, 0, sizeof attrib );
|
||||
attrib.reason = reason;
|
||||
attrib.non_exportable=!node->pkt->pkt.signature->flags.exportable;
|
||||
|
||||
node->flag &= ~NODFLG_MARK_A;
|
||||
sk = m_alloc_secure_clear( sizeof *sk );
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue