summaryrefslogtreecommitdiffstats
path: root/mutt_crypt.h
diff options
context:
space:
mode:
authorKevin McCarthy <kevin@8t8.us>2015-03-30 15:45:55 -0700
committerKevin McCarthy <kevin@8t8.us>2015-03-30 15:45:55 -0700
commit15b615710556a2f0960b580d0961421fe5561ce4 (patch)
tree507101abf559c8f6fcb2ae9afbed11f688d23126 /mutt_crypt.h
parent1d72a322101d00f3962e4d0b5d72e871c5afe755 (diff)
Add a security bit to the message for oppenc mode.
This allows oppenc to be enabled/disabled on a message level. If something initially enables encryption, such as crypt_autoencrypt or crypt_replyencrypt, oppenc is turned off for the message. Change the postpone/resume code to persist the oppenc bit. Also change resend message to enable and invoke oppenc if the option is set.
Diffstat (limited to 'mutt_crypt.h')
-rw-r--r--mutt_crypt.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/mutt_crypt.h b/mutt_crypt.h
index 7ef52e4b..7a934906 100644
--- a/mutt_crypt.h
+++ b/mutt_crypt.h
@@ -39,11 +39,12 @@
#define SIGNOPAQUE (1 << 5)
#define KEYBLOCK (1 << 6) /* KEY too generic? */
#define INLINE (1 << 7)
+#define OPPENCRYPT (1 << 8) /* Opportunistic encrypt mode */
-#define APPLICATION_PGP (1 << 8)
-#define APPLICATION_SMIME (1 << 9)
+#define APPLICATION_PGP (1 << 9)
+#define APPLICATION_SMIME (1 << 10)
-#define PGP_TRADITIONAL_CHECKED (1 << 10)
+#define PGP_TRADITIONAL_CHECKED (1 << 11)
#define PGPENCRYPT (APPLICATION_PGP | ENCRYPT)
#define PGPSIGN (APPLICATION_PGP | SIGN)