security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

g10: Don't ignore failure. On failure, rollback.

Browse Source 
* g10/tofu.c (tofu_set_policy): If record_binding fails, fail.  If the
function fails, rollback the transaction.

--
Signed-off-by: Neal H. Walfield <neal@g10code.com>
This commit is contained in:
Neal H. Walfield 2016-09-16 15:18:56 +02:00
parent c2e563421e
commit 221b0bd0e5
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
g10/tofu.c
View File

@ -3328,6 +3328,7 @@ tofu_get_validity (ctrl_t ctrl, PKT_public_key *pk, strlist_t user_id_list,
gpg_error_t gpg_error_t
tofu_set_policy (ctrl_t ctrl, kbnode_t kb, enum tofu_policy policy) tofu_set_policy (ctrl_t ctrl, kbnode_t kb, enum tofu_policy policy)
{ {
gpg_error_t err;
time_t now = gnupg_get_time (); time_t now = gnupg_get_time ();
tofu_dbs_t dbs; tofu_dbs_t dbs;
PKT_public_key *pk; PKT_public_key *pk;
@ -3370,15 +3371,26 @@ tofu_set_policy (ctrl_t ctrl, kbnode_t kb, enum tofu_policy policy)
email = email_from_user_id (user_id->name); email = email_from_user_id (user_id->name);
record_binding (dbs, fingerprint, email, user_id->name, policy, 1, now); err = record_binding (dbs, fingerprint, email, user_id->name,
policy, 1, now);
if (err)
{
log_error (_("error setting policy for key %s, user id \"%s\": %s"),
fingerprint, email, gpg_strerror (err));
xfree (email);
break;
}
xfree (email); xfree (email);
} }
if (err)
rollback_transaction (ctrl);
else
end_transaction (ctrl, 0); end_transaction (ctrl, 0);
xfree (fingerprint); xfree (fingerprint);
return 0; return err;
} }
/* Set the TOFU policy for all non-revoked user ids in the KEY with /* Set the TOFU policy for all non-revoked user ids in the KEY with