GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

json: Delete primary key if subkey gen fails

Browse Source 
* src/gpgme-json.c (op_delete): Delete primary key on
subkey gen error.

--
This can happen for example if the user cancels the
pinentry to unlock the primary key when adding the
subkey.  To avoid an artifact of a pimary key without
an encryption capable subkey we delete the created
key and treat the whole operation as failed.
This commit is contained in:
Andre Heinecke 2018-08-28 08:35:06 +02:00
parent 7d3c13df26
commit 3bdf8be6d2
No known key found for this signature in database
GPG Key ID: 2978E9D40CBABA5C
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/gpgme-json.c
View File

@ -3084,7 +3084,7 @@ op_createkey (cjson_t request, cjson_t result)
err = gpgme_get_key (keylistctx, new_fpr, &new_key, 1); err = gpgme_get_key (keylistctx, new_fpr, &new_key, 1);
release_onetime_context (keylistctx); release_onetime_context (keylistctx);
if (err) if (err || !new_key)
{ {
gpg_error_object (result, err, "Error finding created key: %s", gpg_error_object (result, err, "Error finding created key: %s",
gpg_strerror (err)); gpg_strerror (err));
@ -3096,7 +3096,27 @@ op_createkey (cjson_t request, cjson_t result)
0, expires, flags |= GPGME_CREATE_ENCR); 0, expires, flags |= GPGME_CREATE_ENCR);
xfree (subkey_algo); xfree (subkey_algo);
if (err) if (err)
goto leave; {
/* This can happen for example if the user cancels the
* pinentry to unlock the primary key when adding the
* subkey. To avoid an artifact of a pimary key without
* an encryption capable subkey we delete the created
* key and treat the whole operation as failed. */
gpgme_error_t err2;
gpg_error_object (result, err, "Error creating subkey: %s",
gpg_strerror (err));
log_info ("Deleting primary key after keygen failure.\n");
err2 = gpgme_op_delete_ext (ctx, new_key, GPGME_DELETE_FORCE |
GPGME_DELETE_ALLOW_SECRET);
if (err2)
{
log_error ("Error deleting primary key: %s",
gpg_strerror (err));
}
gpgme_key_unref (new_key);
goto leave;
}
gpgme_key_unref (new_key);
} }
xjson_AddStringToObject0 (result, "fingerprint", new_fpr); xjson_AddStringToObject0 (result, "fingerprint", new_fpr);