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.

1 files changed, 1 insertions, 2 deletions

diff --git a/crypt.c b/crypt.c
index c3bba973..dc7a669b 100644
--- a/crypt.c
+++ b/crypt.c
@@ -773,8 +773,7 @@ void crypt_opportunistic_encrypt(HEADER *msg)
   if (!WithCrypto)
     return;
 
-  /* crypt_autoencrypt should override crypt_opportunistic_encrypt */
-  if (option (OPTCRYPTAUTOENCRYPT))
+  if (! (option (OPTCRYPTOPPORTUNISTICENCRYPT) && (msg->security & OPPENCRYPT)) )
     return;
 
   crypt_get_keys (msg, &pgpkeylist, 1);