security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-31 11:41:32 +01:00
Code Activity

gpg: Do not continue the export after a cancel for the primary key.

Browse Source 
* g10/export.c (do_export_one_keyblock): Handle a cancel for the
primary key special.
--

GnuPG-bug-id: 6093
This commit is contained in:
Werner Koch 2022-12-16 15:24:33 +01:00
parent f297803a67
commit 49d16f4f6e
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
g10/export.c
View File

@ -2026,7 +2026,16 @@ do_export_one_keyblock (ctrl_t ctrl, kbnode_t keyblock, u32 *keyid,
hexgrip, pk, NULL); hexgrip, pk, NULL);
if (err) if (err)
{ {
if (gpg_err_code (err) == GPG_ERR_FULLY_CANCELED) /* If we receive a fully canceled error we stop
* immediately. If we receive a cancel for a public
* key we also stop immediately because a
* public/secret key is always required first
* (right, we could instead write a stub key but
* that is also kind of surprising). If we receive
* a subkey we skip to the next subkey. */
if (gpg_err_code (err) == GPG_ERR_FULLY_CANCELED
|| (node->pkt->pkttype == PKT_PUBLIC_KEY
&& gpg_err_code (err) == GPG_ERR_CANCELED))
goto leave; goto leave;
write_status_error ("export_keys.secret", err); write_status_error ("export_keys.secret", err);
skip_until_subkey = 1; skip_until_subkey = 1;