security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

gpg: Fix a potential loss of key sigs during import with self-sigs-only.

Browse source 
* g10/import.c (import_one_real): Don't do the final clean in the
merge case.
--

This fixes a regression introduced with self-sigs-only.

GnuPG-bug-id: 4628
Signed-off-by: Werner Koch <wk@gnupg.org>
(cherry picked from commit 6701a38f8e)
This commit is contained in:
Werner Koch 2019-11-07 15:07:25 +01:00
parent 3ae5cefc64
commit 2975868ede
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
2 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
g10/import.c
View file

@ -2115,7 +2115,10 @@ import_one_real (ctrl_t ctrl,
if (err)
goto leave;
if ((options & IMPORT_CLEAN))
/* Clean the final keyblock again if requested. we can't do
* this if only self-signatures are imported; see bug #4628. */
if ((options & IMPORT_CLEAN)
&& !(options & IMPORT_SELF_SIGS_ONLY))
{
merge_keys_and_selfsig (ctrl, keyblock_orig);
clean_all_uids (ctrl, keyblock_orig, opt.verbose,