Add another HEADER security bit for autocrypt.

diff --git a/mutt.h b/mutt.h
index 7bd2be2891a8812ea800a1ec9cc2e0ff3e88f315..706c87fb138350b7bfa89a66b889c449d98b0de6 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -822,7 +822,9 @@ typedef struct mutt_thread THREAD;
 
 typedef struct header
 {
-  unsigned int security : 12;  /* bit 0-8: flags, bit 9,10: application.
+  unsigned int security : 13;  /* bit 0-9:   flags
+                                  bit 10-11: application.
+                                  bit 12:    traditional pgp.
                                   see: mutt_crypt.h pgplib.h, smime.h */
 
   unsigned int mime : 1;               /* has a MIME-Version header? */

diff --git a/mutt_crypt.h b/mutt_crypt.h
index 6b11b3246cf5579feeb1d7aab5c288f7f4835479..bd49bad4b83c571ae99ec4f43380faecec47a657 100644 (file)
--- a/mutt_crypt.h
+++ b/mutt_crypt.h
@@ -30,7 +30,7 @@
    information hiding. */
 
 
-
+/* NOTE: adding flags means HEADER.security bit width needs to be increased */
 #define ENCRYPT    (1 << 0)
 #define SIGN       (1 << 1)
 #define GOODSIGN   (1 << 2)
@@ -40,11 +40,12 @@
 #define KEYBLOCK   (1 << 6) /* KEY too generic? */
 #define INLINE     (1 << 7)
 #define OPPENCRYPT (1 << 8) /* Opportunistic encrypt mode */
+#define AUTOCRYPT  (1 << 9) /* TODO: should this include the ENCRYPT and SIGN flags */
 
-#define APPLICATION_PGP    (1 << 9)
-#define APPLICATION_SMIME  (1 << 10)
+#define APPLICATION_PGP    (1 << 10)
+#define APPLICATION_SMIME  (1 << 11)
 
-#define PGP_TRADITIONAL_CHECKED (1 << 11)
+#define PGP_TRADITIONAL_CHECKED (1 << 12)
 
 #define PGPENCRYPT  (APPLICATION_PGP | ENCRYPT)
 #define PGPSIGN     (APPLICATION_PGP | SIGN)