From: Thomas Roessler <roessler@does-not-exist.org>
Date: Wed, 27 Jan 1999 19:53:38 +0000 (+0000)
Subject: Add $pgp_show_unusable.
X-Git-Tag: mutt-0-96-rel~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=95ae5e554613063d5d73b9fe1e35aeab088e88af;p=mutt

Add $pgp_show_unusable.
---

diff --git a/doc/manual.sgml.in b/doc/manual.sgml.in
index 80868e90..d49d1337 100644
--- a/doc/manual.sgml.in
+++ b/doc/manual.sgml.in
@@ -3371,6 +3371,7 @@ Default: unset
 
 If set, use 64 bit PGP key IDs. Unset uses the normal 32 bit Key IDs.
 
+
 <sect2>pgp&lowbar;receive&lowbar;version<label id="pgp_receive_version">
 <p>
 Type: string<newline>
@@ -3412,6 +3413,15 @@ name="&dollar;pgp&lowbar;default&lowbar;version"> will be used. Set
 this to pgp2 (PGP 2.*), pgp5 (PGP 5.*), or gpg (GNU privacy guard) if
 you want to use a different PGP version for sending operations.
 
+<sect2>pgp&lowbar;show&lowbar;unusable<label id="pgp_show_unusable">
+<p>
+Type: boolean<newline>
+Default: set
+
+If set, mutt will display non-usable keys on the PGP key selection
+menu.  This includes keys which have been revoked, have expired, or
+have been marked as ``disabled'' by the user.
+
 <sect2>pgp&lowbar;sign&lowbar;as<label id="pgp_sign_as">
 <p>
 Type: string<newline>
diff --git a/gnupgparse.c b/gnupgparse.c
index f62bb659..4b192368 100644
--- a/gnupgparse.c
+++ b/gnupgparse.c
@@ -93,20 +93,20 @@ static pgp_key_t *parse_pub_line (char *buf, int *is_subkey, pgp_key_t *k)
 	break;
       }
       case 2:			/* trust info */
-      /*
-       * XXX - is this the owner-trust field?
-       *
-       * Actually, we'd need the trust gpg has into the 
-       * association between a user ID and a key.
-       * 
-       * - tlr
-       */
       {
 	switch (*p)
 	{				/* look only at the first letter */
 	  case 'e':
 	    k->flags |= KEYFLAG_EXPIRED;
 	    break;
+	  case 'r':
+	    k->flags |= KEYFLAG_REVOKED;
+	    break;
+	  
+	  /* produce "undefined trust" as long as gnupg doesn't
+	   * have a proper trust model.
+	   */
+#if 0
 	  case 'n':
 	    trust = 1;
 	    break;
@@ -119,9 +119,7 @@ static pgp_key_t *parse_pub_line (char *buf, int *is_subkey, pgp_key_t *k)
 	  case 'u':
 	    trust = 3;
 	    break;
-	  case 'r':
-	    k->flags |= KEYFLAG_REVOKED;
-	    break;
+#endif	  
 	}
 	break;
       }
diff --git a/init.h b/init.h
index 5734d9de..e6de673c 100644
--- a/init.h
+++ b/init.h
@@ -176,6 +176,7 @@ struct option_t MuttVars[] = {
   { "pgp_long_ids",	DT_BOOL, R_NONE, OPTPGPLONGIDS, 0 },
   { "pgp_replyencrypt",	DT_BOOL, R_NONE, OPTPGPREPLYENCRYPT, 0 },
   { "pgp_replysign",	DT_BOOL, R_NONE, OPTPGPREPLYSIGN, 0 },
+  { "pgp_show_unusable", DT_BOOL, R_NONE, OPTPGPSHOWUNUSABLE, 1 },
   { "pgp_sign_as",	DT_STR,	 R_NONE, UL &PgpSignAs, 0 },
   { "pgp_sign_micalg",	DT_STR,	 R_NONE, UL &PgpSignMicalg, UL "pgp-md5" },
   { "pgp_strict_enc",	DT_BOOL, R_NONE, OPTPGPSTRICTENC, 1 },
diff --git a/mutt.h b/mutt.h
index 5b13a84e..f918fd83 100644
--- a/mutt.h
+++ b/mutt.h
@@ -353,6 +353,7 @@ enum
   OPTPGPENCRYPTSELF,
   OPTPGPSTRICTENC,
   OPTFORWDECRYPT,
+  OPTPGPSHOWUNUSABLE,
 #endif
 
   /* pseudo options */
diff --git a/pgpkey.c b/pgpkey.c
index f3bfd7c6..d1fc9182 100644
--- a/pgpkey.c
+++ b/pgpkey.c
@@ -146,6 +146,9 @@ static pgp_key_t *pgp_select_key (struct pgp_vinfo *pgp,
 
   for (i = 0, kp = keys; kp; kp = kp->next)
   {
+    if (!option (OPTPGPSHOWUNUSABLE) && (kp->flags & KEYFLAG_CANTUSE))
+      continue;
+    
     for (a = kp->address; a; i++, a = a->next)
       ;
   }
@@ -158,6 +161,9 @@ static pgp_key_t *pgp_select_key (struct pgp_vinfo *pgp,
 
   for (i = 0, kp = keys; kp; kp = kp->next)
   {
+    if (!option (OPTPGPSHOWUNUSABLE) && (kp->flags & KEYFLAG_CANTUSE))
+      continue;
+	
     for (a = kp->address; a; i++, a = a->next)
       KeyTable[i] = a;
   }