projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more include simplifications
[apps/madmutt.git]
/
lib-crypt
/
pgpmicalg.c
diff --git
a/lib-crypt/pgpmicalg.c
b/lib-crypt/pgpmicalg.c
index
959ac36
..
c070173
100644
(file)
--- a/
lib-crypt/pgpmicalg.c
+++ b/
lib-crypt/pgpmicalg.c
@@
-11,9
+11,7
@@
* algorithm.
*/
* algorithm.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
#include "mutt.h"
#include "handler.h"
#include "mutt.h"
#include "handler.h"
@@
-21,13
+19,7
@@
#include "pgppacket.h"
#include "charset.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-lib/debug.h>
+#include <lib-ui/curses.h>
#include <lib-mime/mime.h>
#include <lib-mime/mime.h>
@@
-78,7
+70,6
@@
static void pgp_dearmor (FILE * in, FILE * out)
break;
}
if (r == NULL) {
break;
}
if (r == NULL) {
- debug_print (1, ("Can't find begin of ASCII armor.\n"));
return;
}
return;
}
@@
-90,7
+81,6
@@
static void pgp_dearmor (FILE * in, FILE * out)
break;
}
if (r == NULL) {
break;
}
if (r == NULL) {
- debug_print (1, ("Armor header doesn't end.\n"));
return;
}
return;
}
@@
-104,28
+94,24
@@
static void pgp_dearmor (FILE * in, FILE * out)
break;
}
if (r == NULL) {
break;
}
if (r == NULL) {
- debug_print (1, ("Can't find end of ASCII armor.\n"));
return;
}
if ((end = ftello (in) - m_strlen(line)) < start) {
return;
}
if ((end = ftello (in) - m_strlen(line)) < start) {
- debug_print (1, ("end < start???\n"));
return;
}
if (fseeko (in, start, SEEK_SET) == -1) {
return;
}
if (fseeko (in, start, SEEK_SET) == -1) {
- debug_print (1, ("Can't seekto start.\n"));
return;
}
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) {
}
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;
}
return -1;
}
@@
-136,7
+122,6
@@
static short pgp_mic_from_packet (unsigned char *p, size_t len)
/* version 4 signature */
return (short) p[4];
else {
/* version 4 signature */
return (short) p[4];
else {
- debug_print (1, ("Bad signature packet.\n"));
return -1;
}
}
return -1;
}
}
@@
-171,9
+156,6
@@
static short pgp_find_hash (const char *fname)
if ((p = pgp_read_packet (out, &l)) != NULL) {
rv = pgp_mic_from_packet (p, l);
}
if ((p = pgp_read_packet (out, &l)) != NULL) {
rv = pgp_mic_from_packet (p, l);
}
- else {
- debug_print (1, ("No packet.\n"));
- }
bye:
bye: