From: Kevin McCarthy <kevin@8t8.us>
Date: Thu, 24 Jan 2019 23:19:36 +0000 (-0800)
Subject: Simplify nested smime handling in the attachment menu
X-Git-Tag: 2019-10-25~357^2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f8c4e82b05fe19f0fa3e418512367b904fe528fc;p=neomutt

Simplify nested smime handling in the attachment menu

Since changeset 2fd6f99b allows nested encryption handling, there is
no need to deal with the nesting directly.  Instead, just recursive as
with other nested handling.

Co-authored-by: Richard Russon <rich@flatcap.org>
---

diff --git a/recvattach.c b/recvattach.c
index 7da733518..c1aa74551 100644
--- a/recvattach.c
+++ b/recvattach.c
@@ -1167,21 +1167,6 @@ static void mutt_generate_recvattach_list(struct AttachCtx *actx, struct Email *
         goto decrypt_failed;
       }
 
-      /* S/MIME nesting */
-      if ((mutt_is_application_smime(new_body) & SMIME_OPAQUE) == SMIME_OPAQUE)
-      {
-        struct Body *outer_new_body = new_body;
-        FILE *outer_fp = new_fp;
-
-        new_body = NULL;
-        new_fp = NULL;
-
-        secured = !crypt_smime_decrypt_mime(outer_fp, &new_fp, outer_new_body, &new_body);
-
-        mutt_body_free(&outer_new_body);
-        mutt_file_fclose(&outer_fp);
-      }
-
       if (secured && (type & ENCRYPT))
         e->security |= SMIME_ENCRYPT;
     }