security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-02 12:01:32 +01:00
Code Activity

g10: Fix bit setting.

Browse Source 
* g10/tofu.c (build_conflict_set): Fix bit setting.

--
Signed-off-by: Neal H. Walfield <neal@g10code.com>
Fixes-commit: 1f1f56e606c1cb28eec68c60bd8bcb7ab30805de
This commit is contained in:
Neal H. Walfield 2016-10-30 10:54:21 -07:00
parent b6f08dbb0b
commit 614ca00676
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
g10/tofu.c
View File

@ -1963,9 +1963,9 @@ build_conflict_set (tofu_dbs_t dbs, const char *fingerprint, const char *email)
/* The binding is always expired/revoked if the key is /* The binding is always expired/revoked if the key is
* expired/revoked. */ * expired/revoked. */
if (binding_pk->has_expired) if (binding_pk->has_expired)
iter->flags &= BINDING_EXPIRED; iter->flags |= BINDING_EXPIRED;
if (binding_pk->flags.revoked) if (binding_pk->flags.revoked)
iter->flags &= BINDING_REVOKED; iter->flags |= BINDING_REVOKED;
/* The binding is also expired/revoked if the user id is /* The binding is also expired/revoked if the user id is
* expired/revoked. */ * expired/revoked. */
@ -1986,9 +1986,9 @@ build_conflict_set (tofu_dbs_t dbs, const char *fingerprint, const char *email)
found_user_id = 1; found_user_id = 1;
if (user_id2->is_revoked) if (user_id2->is_revoked)
iter->flags &= BINDING_REVOKED; iter->flags |= BINDING_REVOKED;
if (user_id2->is_expired) if (user_id2->is_expired)
iter->flags &= BINDING_EXPIRED; iter->flags |= BINDING_EXPIRED;
} }
xfree (email2); xfree (email2);