Changeset 3391:4bb7a8705ab8 for compose.c

Timestamp:

2003-04-15 02:52:06 (6 years ago)

Author:

Dale Woolridge <dale-flea-mutt-bug@…>

Branch:

HEAD

Message:

The "sign (a)s" code strips the pgp application bit causing drawing
issues in redraw_crypt_lines(). Other bits (well bit = encrypt) are
ignored as a result. I've only tested with pgp, but the same
problem exists in the smime code too. This inline patch (against
cvs head revision) fixes the problem.

Files:

• compose.c (modified) (11 diffs)

compose.c

@@ -167 +167 @@
   {
   case 1: /* (e)ncrypt */
-    msg->security |= PGPENCRYPT;
+    msg->security |= ENCRYPT;
     break;
 
   case 2: /* (s)ign */
-    msg->security |= PGPSIGN;
+    msg->security |= SIGN;
     break;
 
@@ -185 +185 @@
       crypt_pgp_free_key (&p);
       
-      msg->security |= PGPSIGN;
+      msg->security |= SIGN;
         
       crypt_pgp_void_passphrase ();  /* probably need a different passphrase */
@@ -191 +191 @@
     else
     {
-      msg->security &= ~PGPSIGN;
+      msg->security &= ~SIGN;
     }
 
@@ -198 +198 @@
 
   case 4: /* (b)oth */
-    msg->security = PGPENCRYPT | PGPSIGN;
+    msg->security = ENCRYPT | SIGN;
     break;
 
@@ -205 +205 @@
     break;
   }
+
+  if (msg->security && msg->security != APPLICATION_PGP)
+    msg->security |= APPLICATION_PGP;
+  else
+    msg->security = 0;
 
   if(*redraw)
@@ -224 +229 @@
   {
   case 1: /* (e)ncrypt */
-    msg->security |= SMIMEENCRYPT;
+    msg->security |= ENCRYPT;
     break;
 
   case 3: /* encrypt (w)ith */
-    msg->security |= SMIMEENCRYPT;
+    msg->security |= ENCRYPT;
     switch (mutt_multi_choice (_("1: DES, 2: Triple-DES, 3: RC2-40,"
                                  " 4: RC2-64, 5: RC2-128, or (f)orget it? "),
@@ -257 +262 @@
         mutt_message("Can\'t sign: No key specified. use sign(as).");
     else
-        msg->security |= SMIMESIGN;
+        msg->security |= SIGN;
     break;
 
@@ -266 +271 @@
       mutt_str_replace (&SmimeDefaultKey, p);
         
-      msg->security |= SMIMESIGN;
+      msg->security |= SIGN;
 
       /* probably need a different passphrase */
@@ -272 +277 @@
     }
     else
-      msg->security &= ~SMIMESIGN;
+      msg->security &= ~SIGN;
 
     *redraw = REDRAW_FULL;
@@ -278 +283 @@
 
   case 5: /* (b)oth */
-    msg->security = SMIMEENCRYPT | SMIMESIGN;
+    msg->security = ENCRYPT | SIGN;
     break;
 
@@ -285 +290 @@
     break;
   }
+
+  if (msg->security && msg->security != APPLICATION_SMIME)
+    msg->security |= APPLICATION_SMIME;
+  else
+    msg->security = 0;
 
   if(*redraw)