projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tag unused and kill mktemp
[apps/madmutt.git]
/
lib-crypt
/
pgpmicalg.c
diff --git
a/lib-crypt/pgpmicalg.c
b/lib-crypt/pgpmicalg.c
index
1c322be
..
4e5e836
100644
(file)
--- a/
lib-crypt/pgpmicalg.c
+++ b/
lib-crypt/pgpmicalg.c
@@
-11,26
+11,16
@@
* algorithm.
*/
* 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 "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>
-
-#include "lib/debug.h"
static struct {
short id;
static struct {
short id;
@@
-79,7
+69,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
+80,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,28
+93,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;
}
@@
-137,7
+121,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;
}
}
@@
-154,15
+137,15
@@
static short pgp_find_hash (const char *fname)
short rv = -1;
short rv = -1;
-
mutt_mktemp (tempfile
);
- if (
(out = safe_fopen (tempfile, "w+")) == NULL
) {
- mutt_perror (
tempfile
);
+
out = m_tempfile (tempfile, sizeof(tempfile), NONULL(Tempdir), NULL
);
+ if (
!out
) {
+ mutt_perror (
_("Can't create temporary file")
);
goto bye;
}
unlink (tempfile);
if ((in = fopen (fname, "r")) == NULL) {
goto bye;
}
unlink (tempfile);
if ((in = fopen (fname, "r")) == NULL) {
- mutt_perror (
fname
);
+ mutt_perror (
_("Can't create temporary file")
);
goto bye;
}
goto bye;
}
@@
-172,14
+155,11
@@
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:
-
safe_fclose
(&in);
-
safe_fclose
(&out);
+
m_fclose
(&in);
+
m_fclose
(&out);
pgp_release_packet ();
return rv;
}
pgp_release_packet ();
return rv;
}