X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-crypt%2Fpgp.c;h=1cbcc6f842e7784bf5a5bfcf8e1b90094dc14118;hb=69f4685e616347559d4ec714fd826d7f97a472ef;hp=1c9e4bcb2b84492f25e9ffffc75974b410d492fb;hpb=ecfcc6df70230ba136c2fb3843700ecb749c41b7;p=apps%2Fmadmutt.git diff --git a/lib-crypt/pgp.c b/lib-crypt/pgp.c index 1c9e4bc..1cbcc6f 100644 --- a/lib-crypt/pgp.c +++ b/lib-crypt/pgp.c @@ -31,6 +31,7 @@ #include #include +#include #include "mutt.h" #include "handler.h" @@ -38,7 +39,6 @@ #include "copy.h" #include "attach.h" -#include "lib/debug.h" #include #include @@ -61,7 +61,6 @@ #endif #include "crypt.h" -#include "mutt_menu.h" char PgpPass[LONG_STRING]; @@ -69,7 +68,7 @@ time_t PgpExptime = 0; /* when does the cached passphrase expire? */ void pgp_void_passphrase (void) { - p_clear(PgpPass, sizeof(PgpPass)); + p_clear(PgpPass, countof(PgpPass)); PgpExptime = 0; } @@ -148,15 +147,12 @@ static int pgp_copy_checksig (FILE * fpin, FILE * fpout) if (PgpGoodSign.pattern) { char *line = NULL; int lineno = 0; - size_t linelen; + ssize_t linelen; while ((line = mutt_read_line (line, &linelen, fpin, &lineno)) != NULL) { if (regexec (PgpGoodSign.rx, line, 0, NULL, 0) == 0) { - debug_print (2, ("\"%s\" matches regexp.\n", line)); rv = 0; } - else - debug_print (2, ("\"%s\" doesn't match regexp.\n", line)); if (strncmp (line, "[GNUPG:] ", 9) == 0) continue; @@ -166,7 +162,6 @@ static int pgp_copy_checksig (FILE * fpin, FILE * fpout) p_delete(&line); } else { - debug_print (2, ("No pattern.\n")); mutt_copy_stream (fpin, fpout); rv = 1; } @@ -192,7 +187,7 @@ static void pgp_copy_clearsigned (FILE * fpin, STATE * s, char *charset) char buf[HUGE_STRING]; short complete, armor_header; - FGETCONV *fc; + fgetconv_t *fc; rewind (fpin); @@ -419,8 +414,7 @@ int pgp_application_pgp_handler (BODY * m, STATE * s) pgp_copy_clearsigned (tmpfp, s, body_charset); } else if (pgpout) { - FGETCONV *fc; - int c; + fgetconv_t *fc; rewind (pgpout); state_set_prefix (s); @@ -524,13 +518,13 @@ static int pgp_check_traditional_one_body (FILE * fp, BODY * b, /* fix the content type */ - mutt_set_parameter ("format", "fixed", &b->parameter); + parameter_setval(&b->parameter, "format", "fixed"); if (enc) - mutt_set_parameter ("x-action", "pgp-encrypted", &b->parameter); + parameter_setval(&b->parameter, "x-action", "pgp-encrypted"); else if (sgn) - mutt_set_parameter ("x-action", "pgp-signed", &b->parameter); + parameter_setval(&b->parameter, "x-action", "pgp-signed"); else if (key) - mutt_set_parameter ("x-action", "pgp-keys", &b->parameter); + parameter_setval(&b->parameter, "x-action", "pgp-keys"); return 1; } @@ -602,8 +596,6 @@ int pgp_verify_one (BODY * sigbdy, STATE * s, const char *tempfile) if ((rv = mutt_wait_filter (thepid))) badsig = -1; - - debug_print (1, ("mutt_wait_filter returned %d.\n", rv)); } safe_fclose (&pgperr); @@ -613,8 +605,6 @@ int pgp_verify_one (BODY * sigbdy, STATE * s, const char *tempfile) mutt_unlink (sigfile); mutt_unlink (pgperrfile); - debug_print (1, ("returning %d.\n", badsig)); - return badsig; } @@ -1040,9 +1030,9 @@ BODY *pgp_sign_message (BODY * a) t->use_disp = 0; t->disposition = DISPINLINE; - mutt_generate_boundary (&t->parameter); - mutt_set_parameter ("protocol", "application/pgp-signature", &t->parameter); - mutt_set_parameter ("micalg", pgp_micalg (sigfile), &t->parameter); + parameter_set_boundary(&t->parameter); + parameter_setval(&t->parameter, "protocol", "application/pgp-signature"); + parameter_setval(&t->parameter, "micalg", pgp_micalg (sigfile)); t->parts = a; a = t; @@ -1145,8 +1135,8 @@ char *pgp_findKeys (address_t * to, address_t * cc, address_t * bcc) } else if (r == -1) { p_delete(&keylist); - address_delete (&tmp); - address_delete (&addr); + address_list_wipe(&tmp); + address_list_wipe(&addr); return NULL; } } @@ -1162,8 +1152,8 @@ char *pgp_findKeys (address_t * to, address_t * cc, address_t * bcc) if ((key = pgp_ask_for_key (buf, q->mailbox, KEYFLAG_CANENCRYPT, PGP_PUBRING)) == NULL) { p_delete(&keylist); - address_delete (&tmp); - address_delete (&addr); + address_list_wipe(&tmp); + address_list_wipe(&addr); return NULL; } } @@ -1180,10 +1170,10 @@ char *pgp_findKeys (address_t * to, address_t * cc, address_t * bcc) keylist_used = m_strlen(keylist); pgp_free_key (&key); - address_delete (&addr); + address_list_wipe(&addr); } - address_delete (&tmp); + address_list_wipe(&tmp); return (keylist); } @@ -1286,8 +1276,8 @@ BODY *pgp_encrypt_message (BODY * a, char *keylist, int sign) t->use_disp = 0; t->disposition = DISPINLINE; - mutt_generate_boundary (&t->parameter); - mutt_set_parameter ("protocol", "application/pgp-encrypted", &t->parameter); + parameter_set_boundary(&t->parameter); + parameter_setval(&t->parameter, "protocol", "application/pgp-encrypted"); t->parts = mutt_new_body (); t->parts->type = TYPEAPPLICATION; @@ -1358,9 +1348,9 @@ BODY *pgp_traditional_encryptsign (BODY * a, int flags, char *keylist) else from_charset = Charset; - if (!mutt_is_us_ascii (body_charset)) { + if (!charset_is_us_ascii (body_charset)) { int c; - FGETCONV *fc; + fgetconv_t *fc; if (flags & ENCRYPT) send_charset = "us-ascii"; @@ -1454,23 +1444,12 @@ BODY *pgp_traditional_encryptsign (BODY * a, int flags, char *keylist) b->type = TYPETEXT; b->subtype = m_strdup("plain"); - mutt_set_parameter ("x-action", - flags & ENCRYPT ? "pgp-encrypted" : "pgp-signed", - &b->parameter); - mutt_set_parameter ("charset", send_charset, &b->parameter); + parameter_setval(&b->parameter, "x-action", + flags & ENCRYPT ? "pgp-encrypted" : "pgp-signed"); + parameter_setval(&b->parameter, "charset", send_charset); b->filename = m_strdup(pgpoutfile); -#if 0 - /* The following is intended to give a clue to some completely brain-dead - * "mail environments" which are typically used by large corporations. - */ - - b->d_filename = m_strdup("msg.pgp"); - b->use_disp = 1; - -#endif - b->disposition = DISPINLINE; b->unlink = 1;