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 3d7aedbb566ba098b7ec7e026d297217cf654e69..ee82c91c902cb0e102f959578e8103df4fdd1b37 100644 (file)
--- 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;
     }