summaryrefslogtreecommitdiffstats
path: root/gnupgparse.c
diff options
context:
space:
mode:
authorDavid Shaw <dshaw@jabberwocky.com>2003-07-22 12:56:38 +0000
committerDavid Shaw <dshaw@jabberwocky.com>2003-07-22 12:56:38 +0000
commitd2bb30dc24bfea62ba92d12e35209e0c0ae54549 (patch)
tree62250fb7f59acf97758e7d1068f831c2541f71a4 /gnupgparse.c
parenta1127ba266b57360594001e37d8bb627c9b2b50a (diff)
When encrypting a message to a user that has more than one subkey,
at least one of which is revoked or expired, mutt treats the entire key as unusable rather than just the subkey(s) in question.
Diffstat (limited to 'gnupgparse.c')
-rw-r--r--gnupgparse.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/gnupgparse.c b/gnupgparse.c
index ea0663ef..5236e781 100644
--- a/gnupgparse.c
+++ b/gnupgparse.c
@@ -300,7 +300,10 @@ static pgp_key_t parse_pub_line (char *buf, int *is_subkey, pgp_key_t k)
}
if (!is_uid &&
- (!*is_subkey || !option (OPTPGPIGNORESUB) || !(flags & KEYFLAG_DISABLED)))
+ (!*is_subkey || !option (OPTPGPIGNORESUB)
+ || !((flags & KEYFLAG_DISABLED)
+ || (flags & KEYFLAG_REVOKED)
+ || (flags & KEYFLAG_EXPIRED))))
k->flags |= flags;
break;