projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
many simplifications, copyright statements.
[apps/madmutt.git]
/
lib-crypt
/
pgpmicalg.c
diff --git
a/lib-crypt/pgpmicalg.c
b/lib-crypt/pgpmicalg.c
index
1c322be
..
8fe6a5e
100644
(file)
--- a/
lib-crypt/pgpmicalg.c
+++ b/
lib-crypt/pgpmicalg.c
@@
-30,8
+30,6
@@
#include <lib-mime/mime.h>
#include <lib-mime/mime.h>
-#include "lib/debug.h"
-
static struct {
short id;
const char *name;
static struct {
short id;
const char *name;
@@
-79,7
+77,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;
}
@@
-91,7
+88,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;
}
@@
-105,17
+101,14
@@
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;
}
@@
-126,7
+119,6
@@
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) {
- debug_print (1, ("tag = %d, want %d.\n", p[0] & 0x3f, PT_SIG));
return -1;
}
return -1;
}
@@
-137,7
+129,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;
}
}
@@
-172,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);
}
if ((p = pgp_read_packet (out, &l)) != NULL) {
rv = pgp_mic_from_packet (p, l);
}
- else {
- debug_print (1, ("No packet.\n"));
- }
bye:
bye: