mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
* getkey.c (parse_auto_key_locate): Fix dupe-removal code.
* keyedit.c (menu_backsign): Allow backsigning even if the secret subkey doesn't have a binding signature. * armor.c (radix64_read): Don't report EOF when reading only a pad (=) character. The EOF actually starts after the pad. * gpg.c (main): Make --export, --send-keys, --recv-keys, --refresh-keys, and --fetch-keys follow their arguments from left to right. Suggested by Peter Palfrader.
This commit is contained in:
parent
4fdc6387c3
commit
51e88a5fdb
5 changed files with 41 additions and 20 deletions
|
@ -3711,9 +3711,6 @@ menu_backsign(KBNODE pub_keyblock,KBNODE sec_keyblock)
|
|||
break;
|
||||
}
|
||||
|
||||
if(!sig_sk)
|
||||
continue;
|
||||
|
||||
/* Now we can get to work. We have a main key and secret part,
|
||||
a signing subkey with signature and secret part with
|
||||
signature. */
|
||||
|
@ -3744,13 +3741,16 @@ menu_backsign(KBNODE pub_keyblock,KBNODE sec_keyblock)
|
|||
xfree(sig_pk->pkt);
|
||||
sig_pk->pkt=newpkt;
|
||||
|
||||
/* Put the new sig into place on the seckey */
|
||||
newpkt=xmalloc_clear(sizeof(*newpkt));
|
||||
newpkt->pkttype=PKT_SIGNATURE;
|
||||
newpkt->pkt.signature=copy_signature(NULL,newsig);
|
||||
free_packet(sig_sk->pkt);
|
||||
xfree(sig_sk->pkt);
|
||||
sig_sk->pkt=newpkt;
|
||||
if(sig_sk)
|
||||
{
|
||||
/* Put the new sig into place on the seckey */
|
||||
newpkt=xmalloc_clear(sizeof(*newpkt));
|
||||
newpkt->pkttype=PKT_SIGNATURE;
|
||||
newpkt->pkt.signature=copy_signature(NULL,newsig);
|
||||
free_packet(sig_sk->pkt);
|
||||
xfree(sig_sk->pkt);
|
||||
sig_sk->pkt=newpkt;
|
||||
}
|
||||
|
||||
modified=1;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue