projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
pgpmicalg.c
diff --git
a/pgpmicalg.c
b/pgpmicalg.c
index
44f8c18
..
0caba38
100644
(file)
--- a/
pgpmicalg.c
+++ b/
pgpmicalg.c
@@
-16,6
+16,7
@@
#endif
#include "mutt.h"
#endif
#include "mutt.h"
+#include "handler.h"
#include "pgp.h"
#include "pgppacket.h"
#include "mime.h"
#include "pgp.h"
#include "pgppacket.h"
#include "mime.h"
@@
-26,6
+27,8
@@
#include <string.h>
#include <ctype.h>
#include <string.h>
#include <ctype.h>
+#include "lib/debug.h"
+
static struct {
short id;
const char *name;
static struct {
short id;
const char *name;
@@
-73,8
+76,7
@@
static void pgp_dearmor (FILE * in, FILE * out)
break;
}
if (r == NULL) {
break;
}
if (r == NULL) {
- dprint (1,
- (debugfile, "pgp_dearmor: Can't find begin of ASCII armor.\n"));
+ debug_print (1, ("Can't find begin of ASCII armor.\n"));
return;
}
return;
}
@@
-86,7
+88,7
@@
static void pgp_dearmor (FILE * in, FILE * out)
break;
}
if (r == NULL) {
break;
}
if (r == NULL) {
- d
print (1, (debugfile, "pgp_dearmor:
Armor header doesn't end.\n"));
+ d
ebug_print (1, ("
Armor header doesn't end.\n"));
return;
}
return;
}
@@
-100,17
+102,17
@@
static void pgp_dearmor (FILE * in, FILE * out)
break;
}
if (r == NULL) {
break;
}
if (r == NULL) {
- d
print (1, (debugfile, "pgp_dearmor:
Can't find end of ASCII armor.\n"));
+ d
ebug_print (1, ("
Can't find end of ASCII armor.\n"));
return;
}
return;
}
- if ((end = ftell (in) -
mutt_str
len (line)) < start) {
- d
print (1, (debugfile, "pgp_dearmor:
end < start???\n"));
+ if ((end = ftell (in) -
str_
len (line)) < start) {
+ d
ebug_print (1, ("
end < start???\n"));
return;
}
if (fseek (in, start, SEEK_SET) == -1) {
return;
}
if (fseek (in, start, SEEK_SET) == -1) {
- d
print (1, (debugfile, "pgp_dearmor:
Can't seekto start.\n"));
+ d
ebug_print (1, ("
Can't seekto start.\n"));
return;
}
return;
}
@@
-121,8
+123,7
@@
static short pgp_mic_from_packet (unsigned char *p, size_t len)
{
/* is signature? */
if ((p[0] & 0x3f) != PT_SIG) {
{
/* is signature? */
if ((p[0] & 0x3f) != PT_SIG) {
- dprint (1, (debugfile, "pgp_mic_from_packet: tag = %d, want %d.\n",
- p[0] & 0x3f, PT_SIG));
+ debug_print (1, ("tag = %d, want %d.\n", p[0] & 0x3f, PT_SIG));
return -1;
}
return -1;
}
@@
-133,7
+134,7
@@
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 {
- d
print (1, (debugfile, "pgp_mic_from_packet:
Bad signature packet.\n"));
+ d
ebug_print (1, ("
Bad signature packet.\n"));
return -1;
}
}
return -1;
}
}
@@
-169,7
+170,7
@@
static short pgp_find_hash (const char *fname)
rv = pgp_mic_from_packet (p, l);
}
else {
rv = pgp_mic_from_packet (p, l);
}
else {
- d
print (1, (debugfile, "pgp_find_hash:
No packet.\n"));
+ d
ebug_print (1, ("
No packet.\n"));
}
bye:
}
bye: