X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=recvattach.c;h=3339226e75ee4a529969c5111a368d42902a561a;hp=198bfa7f762a30db095a28475d7f3e3a7055188a;hb=d9fb9e0065b85ee47710bbcba7a81a5266e9e948;hpb=558b0bd9de90a9dc28f409d8f46679bf48c72ded

diff --git a/recvattach.c b/recvattach.c
index 198bfa7..3339226 100644
--- a/recvattach.c
+++ b/recvattach.c
@@ -17,9 +17,9 @@
 #include <lib-ui/enter.h>
 #include <lib-ui/menu.h>
 #include <lib-mx/mx.h>
-#include <lib-crypt/crypt.h>
 
 #include "mutt.h"
+#include "crypt.h"
 #include "handler.h"
 #include "recvattach.h"
 #include "attach.h"
@@ -825,14 +825,7 @@ void mutt_view_attachments (HEADER * hdr)
   {
     need_secured = 1;
 
-    if ((hdr->security & ENCRYPT) && !crypt_valid_passphrase (hdr->security)) {
-      mx_close_message (&msg);
-      return;
-    }
     if (hdr->security & APPLICATION_SMIME) {
-      if (hdr->env)
-        crypt_smime_getkeys (hdr->env);
-
       if (mutt_is_application_smime (hdr->content)) {
         secured = !crypt_smime_decrypt_mime (msg->fp, &fp,
                                              hdr->content, &cur);
@@ -935,10 +928,6 @@ void mutt_view_attachments (HEADER * hdr)
       mutt_update_attach_index (cur, &idx, &idxlen, &idxmax, menu);
       break;
 
-    case OP_FORGET_PASSPHRASE:
-      crypt_forget_passphrase ();
-      break;
-
     case OP_EXTRACT_KEYS:
       crypt_pgp_extract_keys_from_attachment_list (fp, menu->tagprefix,
                                                    menu->