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: mutt-1-12-rel~122
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bd7b8f0d8b888446d2652aad8ae89db1ee3c4ed9;p=mutt

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.
---

diff --git a/recvattach.c b/recvattach.c
index 3d7aedbb..ee82c91c 100644
--- a/recvattach.c
+++ b/recvattach.c
@@ -967,22 +967,6 @@ static void mutt_generate_recvattach_list (ATTACH_CONTEXT *actx,
         goto decrypt_failed;
       }
 
-      /* S/MIME nesting */
-      if ((mutt_is_application_smime (new_body) & SMIMEOPAQUE) == SMIMEOPAQUE)
-      {
-        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_free_body (&outer_new_body);
-        safe_fclose (&outer_fp);
-      }
-
       if (secured && (type & ENCRYPT))
         hdr->security |= SMIMEENCRYPT;
     }