From c2e766aed3d4ee53c1c43fc4c7c712618f3fe3df Mon Sep 17 00:00:00 2001
From: Richard Russon <rich@flatcap.org>
Date: Sat, 12 Oct 2019 19:15:57 +0100
Subject: [PATCH] remove used member
Body->is_signed_data was introduced 15 years ago and never used.
---
email/body.h | 6 ------
ncrypt/crypt_gpgme.c | 3 ---
2 files changed, 9 deletions(-)
diff --git a/email/body.h b/email/body.h
index 99500ac6e..cef8490f1 100644
--- a/email/body.h
+++ b/email/body.h
@@ -72,12 +72,6 @@ struct Body
bool noconv : 1; ///< Don't do character set conversion
bool force_charset : 1; ///< Send mode: don't adjust the character set when in send-mode.
- bool is_signed_data : 1; ///< A lot of MUAs don't indicate S/MIME signed-data correctly,
- ///< e.g. they use foo.p7m even for the name of signed data.
- ///< This flag is used to keep track of the actual message type.
- ///< It gets set during the verification (which is done if the encryption try failed)
- ///< and check by the function to figure the type of the message.
-
bool goodsig : 1; ///< Good cryptographic signature
bool warnsig : 1; ///< Maybe good signature
bool badsig : 1; ///< Bad cryptographic signature (needed to check encrypted s/mime-signatures)
diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c
index fcf0ad483..0337be22b 100644
--- a/ncrypt/crypt_gpgme.c
+++ b/ncrypt/crypt_gpgme.c
@@ -2288,14 +2288,11 @@ restart:
gpgme_data_release(plaintext);
plaintext = NULL;
- a->is_signed_data = false;
if (sig_stat)
{
int res, idx;
int anybad = 0;
- if (maybe_signed)
- a->is_signed_data = true;
if (r_is_signed)
*r_is_signed = -1; /* A signature exists. */
--
2.40.0