From: David Shaw <dshaw@jabberwocky.com>
Date: Tue, 22 Jul 2003 12:56:38 +0000 (+0000)
Subject: When encrypting a message to a user that has more than one subkey,
X-Git-Tag: pre-type-punning-patch~39
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d2bb30dc24bfea62ba92d12e35209e0c0ae54549;p=mutt

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.
---

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;