X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-crypt%2Fpgpmicalg.c;h=c30ae752975d0991413cffc0b6f3b69c8b51ec82;hp=8fe6a5edb41a329deeea08e7944453ecf56e12db;hb=b62cf5fb77a75e17b176141d232655e5bd8b7fe1;hpb=23e6291cb5d5b4cd2008403d8b628007fd75ff23

diff --git a/lib-crypt/pgpmicalg.c b/lib-crypt/pgpmicalg.c
index 8fe6a5e..c30ae75 100644
--- a/lib-crypt/pgpmicalg.c
+++ b/lib-crypt/pgpmicalg.c
@@ -11,24 +11,16 @@
  * algorithm.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
+
+#include <lib-mime/mime.h>
+#include <lib-ui/curses.h>
 
-#include "mutt.h"
 #include "handler.h"
 #include "pgp.h"
 #include "pgppacket.h"
 #include "charset.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
-#include <lib-lib/file.h>
-
-#include <lib-mime/mime.h>
 
 static struct {
   short id;
@@ -112,7 +104,7 @@ static void pgp_dearmor (FILE * in, FILE * out)
     return;
   }
 
-  mutt_decode_base64 (&state, end - start, 0, (iconv_t) - 1);
+  mutt_decode_base64 (&state, end - start, 0, MUTT_ICONV_ERROR);
 }
 
 static short pgp_mic_from_packet (unsigned char *p, size_t len)
@@ -166,8 +158,8 @@ static short pgp_find_hash (const char *fname)
 
 bye:
 
-  safe_fclose (&in);
-  safe_fclose (&out);
+  m_fclose(&in);
+  m_fclose(&out);
   pgp_release_packet ();
   return rv;
 }