X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-crypt%2Fpgpmicalg.c;h=f750e192e1371c5db17159ddaf43a34c9857348d;hb=7a71ecec5189c821b7c2389b61ffd0da449031c1;hp=959ac3641e661994b9e67212d4a9bb4d1c198527;hpb=05a3bbbe420e4afc76e0eea24ce32f859405dc4a;p=apps%2Fmadmutt.git

diff --git a/lib-crypt/pgpmicalg.c b/lib-crypt/pgpmicalg.c
index 959ac36..f750e19 100644
--- a/lib-crypt/pgpmicalg.c
+++ b/lib-crypt/pgpmicalg.c
@@ -27,7 +27,6 @@
 #include <ctype.h>
 
 #include <lib-lib/file.h>
-#include <lib-lib/debug.h>
 
 #include <lib-mime/mime.h>
 
@@ -78,7 +77,6 @@ static void pgp_dearmor (FILE * in, FILE * out)
       break;
   }
   if (r == NULL) {
-    debug_print (1, ("Can't find begin of ASCII armor.\n"));
     return;
   }
 
@@ -90,7 +88,6 @@ static void pgp_dearmor (FILE * in, FILE * out)
       break;
   }
   if (r == NULL) {
-    debug_print (1, ("Armor header doesn't end.\n"));
     return;
   }
 
@@ -104,28 +101,24 @@ static void pgp_dearmor (FILE * in, FILE * out)
       break;
   }
   if (r == NULL) {
-    debug_print (1, ("Can't find end of ASCII armor.\n"));
     return;
   }
 
   if ((end = ftello (in) - m_strlen(line)) < start) {
-    debug_print (1, ("end < start???\n"));
     return;
   }
 
   if (fseeko (in, start, SEEK_SET) == -1) {
-    debug_print (1, ("Can't seekto start.\n"));
     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)
 {
   /* is signature? */
   if ((p[0] & 0x3f) != PT_SIG) {
-    debug_print (1, ("tag = %d, want %d.\n", p[0] & 0x3f, PT_SIG));
     return -1;
   }
 
@@ -136,7 +129,6 @@ static short pgp_mic_from_packet (unsigned char *p, size_t len)
     /* version 4 signature */
     return (short) p[4];
   else {
-    debug_print (1, ("Bad signature packet.\n"));
     return -1;
   }
 }
@@ -171,9 +163,6 @@ static short pgp_find_hash (const char *fname)
   if ((p = pgp_read_packet (out, &l)) != NULL) {
     rv = pgp_mic_from_packet (p, l);
   }
-  else {
-    debug_print (1, ("No packet.\n"));
-  }
 
 bye: