mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
last hour fixes.
This commit is contained in:
parent
94e6596bec
commit
7bf54c22e9
11 changed files with 41 additions and 38 deletions
|
@ -1886,7 +1886,7 @@ merge_public_with_secret ( KBNODE pubblock, KBNODE secblock )
|
|||
if ( !cmp_public_secret_key ( pk, sk ) ) {
|
||||
copy_public_parts_to_secret_key ( pk, sk );
|
||||
free_public_key ( pk );
|
||||
pub->pkt->pkttype = PKT_SECRET_KEY;
|
||||
pub->pkt->pkttype = PKT_SECRET_SUBKEY;
|
||||
pub->pkt->pkt.secret_key = copy_secret_key (NULL, sk);
|
||||
break;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue