fix gpgme S/MIME non-detached signature handling

- gpgsm ends the session after the decrypt error, so restart gpgsm when
  retrying with "maybe_signed".
- evolution sends encrypted + signed S/MIME mails with non-detached
  signatures

diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c
index f221c5699cadde13c4abc16506ce0fcd22c424ab..d4a7564e7db663dd1626c5bbd6cec541fb39788d 100644 (file)
--- a/ncrypt/crypt_gpgme.c
+++ b/ncrypt/crypt_gpgme.c
@@ -1705,6 +1705,9 @@ restart:
       {
         maybe_signed = true;
         gpgme_data_release(plaintext);
+        /* gpgsm ends the session after an error; restart it */
+        gpgme_release(ctx);
+        ctx = create_gpgme_context(is_smime);
         goto restart;
       }
     }