projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
forgotten debug
[apps/madmutt.git]
/
pgp.c
diff --git
a/pgp.c
b/pgp.c
index
18931a1
..
ab582c3
100644
(file)
--- a/
pgp.c
+++ b/
pgp.c
@@
-25,13
+25,15
@@
#include <lib-lib/ascii.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include <lib-lib/ascii.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
+
+#include <lib-mime/mime.h>
#include "mutt.h"
#include "enter.h"
#include "handler.h"
#include "mutt_curses.h"
#include "pgp.h"
#include "mutt.h"
#include "enter.h"
#include "handler.h"
#include "mutt_curses.h"
#include "pgp.h"
-#include "mime.h"
#include "copy.h"
#include "attach.h"
#include "copy.h"
#include "attach.h"
@@
-68,7
+70,7
@@
time_t PgpExptime = 0; /* when does the cached passphrase expire? */
void pgp_void_passphrase (void)
{
void pgp_void_passphrase (void)
{
-
memset (PgpPass, 0, sizeof
(PgpPass));
+
p_clear(PgpPass, sizeof
(PgpPass));
PgpExptime = 0;
}
PgpExptime = 0;
}
@@
-206,11
+208,11
@@
static void pgp_copy_clearsigned (FILE * fpin, STATE * s, char *charset)
continue;
}
continue;
}
- if (
str_cmp
(buf, "-----BEGIN PGP SIGNATURE-----\n") == 0)
+ if (
m_strcmp
(buf, "-----BEGIN PGP SIGNATURE-----\n") == 0)
break;
if (armor_header) {
break;
if (armor_header) {
- char *p =
str_skip_initws
(buf);
+ char *p =
vskipspaces
(buf);
if (*p == '\0')
armor_header = 0;
if (*p == '\0')
armor_header = 0;
@@
-268,18
+270,18
@@
int pgp_application_pgp_handler (BODY * m, STATE * s)
bytes -= (offset - last_pos); /* don't rely on m_strlen(buf) */
last_pos = offset;
bytes -= (offset - last_pos); /* don't rely on m_strlen(buf) */
last_pos = offset;
- if (
str_ncmp
("-----BEGIN PGP ", buf, 15) == 0) {
+ if (
m_strncmp
("-----BEGIN PGP ", buf, 15) == 0) {
clearsign = 0;
start_pos = last_pos;
clearsign = 0;
start_pos = last_pos;
- if (
str_cmp
("MESSAGE-----\n", buf + 15) == 0)
+ if (
m_strcmp
("MESSAGE-----\n", buf + 15) == 0)
needpass = 1;
needpass = 1;
- else if (
str_cmp
("SIGNED MESSAGE-----\n", buf + 15) == 0) {
+ else if (
m_strcmp
("SIGNED MESSAGE-----\n", buf + 15) == 0) {
clearsign = 1;
needpass = 0;
}
else if (!option (OPTDONTHANDLEPGPKEYS) &&
clearsign = 1;
needpass = 0;
}
else if (!option (OPTDONTHANDLEPGPKEYS) &&
-
str_cmp
("PUBLIC KEY BLOCK-----\n", buf + 15) == 0) {
+
m_strcmp
("PUBLIC KEY BLOCK-----\n", buf + 15) == 0) {
needpass = 0;
pgp_keyblock = 1;
}
needpass = 0;
pgp_keyblock = 1;
}
@@
-309,10
+311,10
@@
int pgp_application_pgp_handler (BODY * m, STATE * s)
fputs (buf, tmpfp);
if ((needpass
fputs (buf, tmpfp);
if ((needpass
- &&
str_cmp
("-----END PGP MESSAGE-----\n", buf) == 0)
+ &&
m_strcmp
("-----END PGP MESSAGE-----\n", buf) == 0)
|| (!needpass
|| (!needpass
- && (
str_cmp
("-----END PGP SIGNATURE-----\n", buf) == 0
- ||
str_cmp
("-----END PGP PUBLIC KEY BLOCK-----\n",
+ && (
m_strcmp
("-----END PGP SIGNATURE-----\n", buf) == 0
+ ||
m_strcmp
("-----END PGP PUBLIC KEY BLOCK-----\n",
buf) == 0)))
break;
}
buf) == 0)))
break;
}
@@
-506,12
+508,12
@@
static int pgp_check_traditional_one_body (FILE * fp, BODY * b,
}
while (fgets (buf, sizeof (buf), tfp)) {
}
while (fgets (buf, sizeof (buf), tfp)) {
- if (
str_ncmp
("-----BEGIN PGP ", buf, 15) == 0) {
- if (
str_cmp
("MESSAGE-----\n", buf + 15) == 0)
+ if (
m_strncmp
("-----BEGIN PGP ", buf, 15) == 0) {
+ if (
m_strcmp
("MESSAGE-----\n", buf + 15) == 0)
enc = 1;
enc = 1;
- else if (
str_cmp
("SIGNED MESSAGE-----\n", buf + 15) == 0)
+ else if (
m_strcmp
("SIGNED MESSAGE-----\n", buf + 15) == 0)
sgn = 1;
sgn = 1;
- else if (
str_cmp
("PUBLIC KEY BLOCK-----\n", buf + 15) == 0)
+ else if (
m_strcmp
("PUBLIC KEY BLOCK-----\n", buf + 15) == 0)
key = 1;
}
}
key = 1;
}
}
@@
-687,7
+689,7
@@
static void pgp_extract_keys_from_attachment (FILE * fp, BODY * top)
return;
}
return;
}
-
memset (&s, 0, sizeof (STATE)
);
+
p_clear(&s, 1
);
s.fpin = fp;
s.fpout = tempfp;
s.fpin = fp;
s.fpout = tempfp;
@@
-842,7
+844,7
@@
int pgp_decrypt_mime (FILE * fpin, FILE ** fpout, BODY * b, BODY ** cur)
b = b->parts->next;
b = b->parts->next;
-
memset (&s, 0, sizeof (s)
);
+
p_clear(&s, 1
);
s.fpin = fpin;
mutt_mktemp (tempfile);
if ((*fpout = safe_fopen (tempfile, "w+")) == NULL) {
s.fpin = fpin;
mutt_mktemp (tempfile);
if ((*fpout = safe_fopen (tempfile, "w+")) == NULL) {
@@
-993,9
+995,9
@@
BODY *pgp_sign_message (BODY * a)
* recommended for future releases of PGP.
*/
while (fgets (buffer, sizeof (buffer) - 1, pgpout) != NULL) {
* recommended for future releases of PGP.
*/
while (fgets (buffer, sizeof (buffer) - 1, pgpout) != NULL) {
- if (
str_cmp
("-----BEGIN PGP MESSAGE-----\n", buffer) == 0)
+ if (
m_strcmp
("-----BEGIN PGP MESSAGE-----\n", buffer) == 0)
fputs ("-----BEGIN PGP SIGNATURE-----\n", fp);
fputs ("-----BEGIN PGP SIGNATURE-----\n", fp);
- else if (
str_cmp
("-----END PGP MESSAGE-----\n", buffer) == 0)
+ else if (
m_strcmp
("-----END PGP MESSAGE-----\n", buffer) == 0)
fputs ("-----END PGP SIGNATURE-----\n", fp);
else
fputs (buffer, fp);
fputs ("-----END PGP SIGNATURE-----\n", fp);
else
fputs (buffer, fp);
@@
-1076,14
+1078,14
@@
static short is_numerical_keyid (const char *s)
/* This routine attempts to find the keyids of the recipients of a message.
* It returns NULL if any of the keys can not be found.
*/
/* This routine attempts to find the keyids of the recipients of a message.
* It returns NULL if any of the keys can not be found.
*/
-char *pgp_findKeys (
ADDRESS * to, ADDRESS * cc, ADDRESS
* bcc)
+char *pgp_findKeys (
address_t * to, address_t * cc, address_t
* bcc)
{
char *keyID, *keylist = NULL, *t;
size_t keylist_size = 0;
size_t keylist_used = 0;
{
char *keyID, *keylist = NULL, *t;
size_t keylist_size = 0;
size_t keylist_used = 0;
-
ADDRESS
*tmp = NULL, *addr = NULL;
-
ADDRESS
**last = &tmp;
-
ADDRESS
*p, *q;
+
address_t
*tmp = NULL, *addr = NULL;
+
address_t
**last = &tmp;
+
address_t
*p, *q;
int i;
pgp_key_t k_info = NULL, key = NULL;
int i;
pgp_key_t k_info = NULL, key = NULL;
@@
-1104,7
+1106,7
@@
char *pgp_findKeys (ADDRESS * to, ADDRESS * cc, ADDRESS * bcc)
abort ();
}
abort ();
}
- *last =
rfc822_cpy_adr
(p);
+ *last =
address_list_dup
(p);
while (*last)
last = &((*last)->next);
}
while (*last)
last = &((*last)->next);
}
@@
-1144,8
+1146,8
@@
char *pgp_findKeys (ADDRESS * to, ADDRESS * cc, ADDRESS * bcc)
}
else if (r == -1) {
p_delete(&keylist);
}
else if (r == -1) {
p_delete(&keylist);
-
rfc822_free_address
(&tmp);
-
rfc822_free_address
(&addr);
+
address_delete
(&tmp);
+
address_delete
(&addr);
return NULL;
}
}
return NULL;
}
}
@@
-1161,8
+1163,8
@@
char *pgp_findKeys (ADDRESS * to, ADDRESS * cc, ADDRESS * bcc)
if ((key = pgp_ask_for_key (buf, q->mailbox,
KEYFLAG_CANENCRYPT, PGP_PUBRING)) == NULL) {
p_delete(&keylist);
if ((key = pgp_ask_for_key (buf, q->mailbox,
KEYFLAG_CANENCRYPT, PGP_PUBRING)) == NULL) {
p_delete(&keylist);
-
rfc822_free_address
(&tmp);
-
rfc822_free_address
(&addr);
+
address_delete
(&tmp);
+
address_delete
(&addr);
return NULL;
}
}
return NULL;
}
}
@@
-1179,10
+1181,10
@@
char *pgp_findKeys (ADDRESS * to, ADDRESS * cc, ADDRESS * bcc)
keylist_used = m_strlen(keylist);
pgp_free_key (&key);
keylist_used = m_strlen(keylist);
pgp_free_key (&key);
-
rfc822_free_address
(&addr);
+
address_delete
(&addr);
}
}
-
rfc822_free_address
(&tmp);
+
address_delete
(&tmp);
return (keylist);
}
return (keylist);
}