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

g10: Move more flags into the flag bitfield.

Browse source 
* g10/packet.h (PKT_user_id): Move 'is_primary', 'is_revoked', and
'is_expired' into the flags bitfield, and drop the prefix.
* g10/call-dirmngr.c: Adapt accordingly.
* g10/export.c: Likewise.
* g10/getkey.c: Likewise.
* g10/import.c: Likewise.
* g10/kbnode.c: Likewise.
* g10/keyedit.c: Likewise.
* g10/keylist.c: Likewise.
* g10/keyserver.c: Likewise.
* g10/mainproc.c: Likewise.
* g10/pkclist.c: Likewise.
* g10/pubkey-enc.c: Likewise.
* g10/tofu.c: Likewise.
* g10/trust.c: Likewise.
* g10/trustdb.c: Likewise.
--

This patch has been created by applying the following semantic patch:

    @@
    expression E;
    @@
    -E->is_expired
    +E->flags.expired

    @@
    expression E;
    @@
    -E->is_primary
    +E->flags.primary

    @@
    expression E;
    @@
    -E->is_revoked
    +E->flags.revoked

Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
Justus Winter 2017-03-08 11:01:22 +01:00
parent 8f02864223
commit 2649fdfff5
No known key found for this signature in database
GPG key ID: DD1A52F9DA8C9020
15 changed files with 90 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

8
g10/tofu.c
View file

@ -2209,9 +2209,9 @@ build_conflict_set (tofu_dbs_t dbs,
{
found_user_id = 1;
if (user_id2->is_revoked)
if (user_id2->flags.revoked)
iter->flags |= BINDING_REVOKED;
if (user_id2->is_expired)
if (user_id2->flags.expired)
iter->flags |= BINDING_EXPIRED;
}
@ -3486,7 +3486,7 @@ tofu_register_encryption (ctrl_t ctrl,
{
PKT_user_id *uid = n->pkt->pkt.user_id;
if (uid->is_revoked)
if (uid->flags.revoked)
continue;
add_to_strlist (&user_id_list, uid->name);
@ -3871,7 +3871,7 @@ tofu_set_policy (ctrl_t ctrl, kbnode_t kb, enum tofu_policy policy)
continue;
user_id = kb->pkt->pkt.user_id;
if (user_id->is_revoked)
if (user_id->flags.revoked)
/* Skip revoked user ids. (Don't skip expired user ids, the
expiry can be changed.) */
continue;