diff options
Diffstat (limited to 'g10/keyedit.c')
| -rw-r--r-- | g10/keyedit.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/g10/keyedit.c b/g10/keyedit.c index dadf58685..88e2f4fd5 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -1164,7 +1164,7 @@ sign_uids (ctrl_t ctrl, estream_t fp, uidnode->flag &= ~NODFLG_MARK_A; uidnode = NULL; } - else if (uidnode->pkt->pkt.user_id->is_revoked) + else if (uidnode->pkt->pkt.user_id->flags.revoked) { tty_fprintf (fp, _("User ID \"%s\" is revoked."), user); @@ -1192,7 +1192,7 @@ sign_uids (ctrl_t ctrl, estream_t fp, tty_fprintf (fp, _(" Unable to sign.\n")); } } - else if (uidnode->pkt->pkt.user_id->is_expired) + else if (uidnode->pkt->pkt.user_id->flags.expired) { tty_fprintf (fp, _("User ID \"%s\" is expired."), user); @@ -3714,9 +3714,9 @@ show_key_with_all_names_colon (ctrl_t ctrl, estream_t fp, kbnode_t keyblock) else es_fputs ("uid:", fp); - if (uid->is_revoked) + if (uid->flags.revoked) es_fputs ("r::::::::", fp); - else if (uid->is_expired) + else if (uid->flags.expired) es_fputs ("e::::::::", fp); else if (opt.fast_list_mode || opt.no_expensive_trust_checks) es_fputs ("::::::::", fp); @@ -3764,11 +3764,11 @@ show_key_with_all_names_colon (ctrl_t ctrl, estream_t fp, kbnode_t keyblock) es_putc (':', fp); /* flags */ es_fprintf (fp, "%d,", i); - if (uid->is_primary) + if (uid->flags.primary) es_putc ('p', fp); - if (uid->is_revoked) + if (uid->flags.revoked) es_putc ('r', fp); - if (uid->is_expired) + if (uid->flags.expired) es_putc ('e', fp); if ((node->flag & NODFLG_SELUID)) es_putc ('s', fp); @@ -3814,7 +3814,7 @@ show_names (ctrl_t ctrl, estream_t fp, tty_fprintf (fp, " "); else if (node->flag & NODFLG_SELUID) tty_fprintf (fp, "(%d)* ", i); - else if (uid->is_primary) + else if (uid->flags.primary) tty_fprintf (fp, "(%d). ", i); else tty_fprintf (fp, "(%d) ", i); @@ -4146,9 +4146,9 @@ show_basic_key_info (KBNODE keyblock) ++i; tty_printf (" "); - if (uid->is_revoked) + if (uid->flags.revoked) tty_printf ("[%s] ", _("revoked")); - else if (uid->is_expired) + else if (uid->flags.expired) tty_printf ("[%s] ", _("expired")); tty_print_utf8_string (uid->name, uid->len); tty_printf ("\n"); @@ -4256,7 +4256,7 @@ no_primary_warning (KBNODE keyblock) { uid_count++; - if (node->pkt->pkt.user_id->is_primary == 2) + if (node->pkt->pkt.user_id->flags.primary == 2) { have_primary = 1; break; @@ -4457,7 +4457,7 @@ menu_deluid (KBNODE pub_keyblock) { /* Only cause a trust update if we delete a non-revoked user id */ - if (!node->pkt->pkt.user_id->is_revoked) + if (!node->pkt->pkt.user_id->flags.revoked) update_trust = 1; delete_kbnode (node); } @@ -4577,9 +4577,9 @@ menu_clean (KBNODE keyblock, int self_only) { const char *reason; - if (uidnode->pkt->pkt.user_id->is_revoked) + if (uidnode->pkt->pkt.user_id->flags.revoked) reason = _("revoked"); - else if (uidnode->pkt->pkt.user_id->is_expired) + else if (uidnode->pkt->pkt.user_id->flags.expired) reason = _("expired"); else reason = _("invalid"); @@ -6314,7 +6314,7 @@ reloop: /* (must use this, because we are modifing the list) */ /* Are we revoking our own uid? */ if (primary_pk->keyid[0] == sig->keyid[0] && primary_pk->keyid[1] == sig->keyid[1]) - unode->pkt->pkt.user_id->is_revoked = 1; + unode->pkt->pkt.user_id->flags.revoked = 1; pkt = xmalloc_clear (sizeof *pkt); pkt->pkttype = PKT_SIGNATURE; pkt->pkt.signature = sig; @@ -6348,7 +6348,7 @@ core_revuid (ctrl_t ctrl, kbnode_t keyblock, KBNODE node, { PKT_user_id *uid = node->pkt->pkt.user_id; - if (uid->is_revoked) + if (uid->flags.revoked) { char *user = utf8_to_native (uid->name, uid->len, 0); log_info (_("user ID \"%s\" is already revoked\n"), user); @@ -6408,7 +6408,7 @@ core_revuid (ctrl_t ctrl, kbnode_t keyblock, KBNODE node, update_trust = 1; #endif /*!NO_TRUST_MODELS*/ - node->pkt->pkt.user_id->is_revoked = 1; + node->pkt->pkt.user_id->flags.revoked = 1; if (modified) *modified = 1; } |