X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-crypt%2Fcrypt-gpgme.c;h=29a676e0b57ef065e81d2894a63a8aee4a253fa6;hp=f20d052221df7ea54a29a50f04d1cbf5d16a7248;hb=916e4872caf252a5850e64f79427b9dd7808435d;hpb=4a0b020a3048f079979bea43c04f9fe388f9354d diff --git a/lib-crypt/crypt-gpgme.c b/lib-crypt/crypt-gpgme.c index f20d052..29a676e 100644 --- a/lib-crypt/crypt-gpgme.c +++ b/lib-crypt/crypt-gpgme.c @@ -12,17 +12,21 @@ * please see the file GPL in the top level source directory. */ -#if HAVE_CONFIG_H -# include "config.h" -#endif +#include #ifdef CRYPT_BACKEND_GPGME -#include -#include -#include -#include -#include +#ifdef HAVE_LOCALE_H +# include +#endif +#ifdef HAVE_LANGINFO_D_T_FMT +# include +#endif +#ifdef HAVE_SYS_RESOURCE_H +# include +#endif + +#include #include @@ -30,40 +34,15 @@ #include #include -#include "mutt.h" +#include "lib.h" +#include "alias.h" #include #include "handler.h" #include "copy.h" #include "pager.h" #include "recvattach.h" #include "sort.h" - -#include "lib/debug.h" - -#include -#include -#include -#include -#include -#include -#include - -#include - -#ifdef HAVE_LOCALE_H -#include -#endif -#ifdef HAVE_LANGINFO_D_T_FMT -#include -#endif - -#ifdef HAVE_SYS_TIME_H -# include -#endif - -#ifdef HAVE_SYS_RESOURCE_H -# include -#endif +#include "crypt-gpgme.h" /* * Helper macros. @@ -109,7 +88,7 @@ typedef struct crypt_keyinfo { } crypt_key_t; typedef struct crypt_entry { - size_t num; + ssize_t num; crypt_key_t *key; } crypt_entry_t; @@ -132,7 +111,7 @@ static int digit_or_letter (const unsigned char *s) /* Print the utf-8 encoded string BUF of length LEN bytes to stream FP. Convert the character set. */ -static void print_utf8 (FILE * fp, const char *buf, size_t len) +static void print_utf8 (FILE * fp, const char *buf, ssize_t len) { char *tstr; @@ -253,8 +232,8 @@ static int crypt_id_is_strong (crypt_key_t * key) { gpgme_validity_t val = GPGME_VALIDITY_UNKNOWN; gpgme_user_id_t uid = NULL; - unsigned int is_strong = 0; - unsigned int i = 0; + int is_strong = 0; + int i = 0; if ((key->flags & KEYFLAG_ISX509)) return 1; @@ -369,10 +348,9 @@ static gpgme_data_t body_to_data_object (BODY * a, int convert) int err = 0; gpgme_data_t data; - mutt_mktemp (tempfile); - fptmp = safe_fopen (tempfile, "w+"); + fptmp = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL); if (!fptmp) { - mutt_perror (tempfile); + mutt_perror (_("Can't create temporary file")); return NULL; } @@ -401,13 +379,11 @@ static gpgme_data_t body_to_data_object (BODY * a, int convert) buf[0] = c; gpgme_data_write (data, buf, 1); } - fclose (fptmp); gpgme_data_seek (data, 0, SEEK_SET); - } - else { - fclose (fptmp); + } else { err = gpgme_data_new_from_file (&data, tempfile, 1); } + m_fclose(&fptmp); unlink (tempfile); if (err) { mutt_error (_("error allocating data object: %s\n"), gpgme_strerror (err)); @@ -476,12 +452,11 @@ static char *data_object_to_tempfile (gpgme_data_t data, FILE ** ret_fp) int err; char tempfile[_POSIX_PATH_MAX]; FILE *fp; - size_t nread = 0; + ssize_t nread = 0; - mutt_mktemp (tempfile); - fp = safe_fopen (tempfile, "w+"); + fp = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL); if (!fp) { - mutt_perror (tempfile); + mutt_perror (_("Can't create temporary file")); return NULL; } @@ -493,7 +468,7 @@ static char *data_object_to_tempfile (gpgme_data_t data, FILE ** ret_fp) while ((nread = gpgme_data_read (data, buf, sizeof (buf)))) { if (fwrite (buf, nread, 1, fp) != 1) { mutt_perror (tempfile); - fclose (fp); + m_fclose(&fp); unlink (tempfile); return NULL; } @@ -502,11 +477,11 @@ static char *data_object_to_tempfile (gpgme_data_t data, FILE ** ret_fp) if (ret_fp) rewind (fp); else - fclose (fp); + m_fclose(&fp); if (nread == -1) { mutt_error (_("error reading data object: %s\n"), gpgme_strerror (err)); unlink (tempfile); - fclose (fp); + m_fclose(&fp); return NULL; } if (ret_fp) @@ -538,7 +513,7 @@ static gpgme_key_t *create_recipient_set (const char *keylist, do { while (*s == ' ') s++; - for (i = 0; *s && *s != ' ' && i < sizeof (buf) - 1;) + for (i = 0; *s && *s != ' ' && i < ssizeof(buf) - 1;) buf[i++] = *s++; buf[i] = 0; if (*buf) { @@ -676,7 +651,7 @@ static char *encrypt_gpgme_object (gpgme_data_t plaintext, gpgme_key_t * rset, which must have been allocated by the caller with size BUFLEN. Returns 0 on success or -1 in case of an error. The return string is truncted to BUFLEN - 1. */ -static int get_micalg (gpgme_ctx_t ctx, char *buf, size_t buflen) +static int get_micalg (gpgme_ctx_t ctx, char *buf, ssize_t buflen) { gpgme_sign_result_t result = NULL; const char *algorithm_name = NULL; @@ -760,34 +735,34 @@ static BODY *sign_message (BODY * a, int use_smime) return NULL; } - t = mutt_new_body (); + t = body_new(); t->type = TYPEMULTIPART; t->subtype = m_strdup("signed"); t->encoding = ENC7BIT; t->use_disp = 0; t->disposition = DISPINLINE; - mutt_generate_boundary (&t->parameter); - mutt_set_parameter ("protocol", - use_smime ? "application/pkcs7-signature" - : "application/pgp-signature", &t->parameter); + parameter_set_boundary(&t->parameter); + parameter_setval(&t->parameter, "protocol", + use_smime ? "application/pkcs7-signature" + : "application/pgp-signature"); /* Get the micalg from gpgme. Old gpgme versions don't support this for S/MIME so we assume sha-1 in this case. */ if (!get_micalg (ctx, buf, sizeof buf)) - mutt_set_parameter ("micalg", buf, &t->parameter); + parameter_setval(&t->parameter, "micalg", buf); else if (use_smime) - mutt_set_parameter ("micalg", "sha1", &t->parameter); + parameter_setval(&t->parameter, "micalg", "sha1"); gpgme_release (ctx); t->parts = a; a = t; - t->parts->next = mutt_new_body (); + t->parts->next = body_new(); t = t->parts->next; t->type = TYPEAPPLICATION; if (use_smime) { t->subtype = m_strdup("pkcs7-signature"); - mutt_set_parameter ("name", "smime.p7s", &t->parameter); + parameter_setval(&t->parameter, "name", "smime.p7s"); t->encoding = ENCBASE64; t->use_disp = 1; t->disposition = DISPATTACH; @@ -847,22 +822,22 @@ BODY *pgp_gpgme_encrypt_message (BODY * a, char *keylist, int sign) if (!outfile) return NULL; - t = mutt_new_body (); + t = body_new(); t->type = TYPEMULTIPART; t->subtype = m_strdup("encrypted"); t->encoding = ENC7BIT; 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 = body_new(); t->parts->type = TYPEAPPLICATION; t->parts->subtype = m_strdup("pgp-encrypted"); t->parts->encoding = ENC7BIT; - t->parts->next = mutt_new_body (); + t->parts->next = body_new(); t->parts->next->type = TYPEAPPLICATION; t->parts->next->subtype = m_strdup("octet-stream"); t->parts->next->encoding = ENC7BIT; @@ -905,11 +880,11 @@ BODY *smime_gpgme_build_smime_entity (BODY * a, char *keylist) if (!outfile) return NULL; - t = mutt_new_body (); + t = body_new(); t->type = TYPEAPPLICATION; t->subtype = m_strdup("pkcs7-mime"); - mutt_set_parameter ("name", "smime.p7m", &t->parameter); - mutt_set_parameter ("smime-type", "enveloped-data", &t->parameter); + parameter_setval(&t->parameter, "name", "smime.p7m"); + parameter_setval(&t->parameter, "smime-type", "enveloped-data"); t->encoding = ENCBASE64; /* The output of OpenSSL SHOULD be binary */ t->use_disp = 1; t->disposition = DISPATTACH; @@ -958,7 +933,7 @@ static int show_sig_summary (unsigned long sum, if ((sum & GPGME_SIGSUM_SIG_EXPIRED)) { gpgme_verify_result_t result; gpgme_signature_t sig; - unsigned int i; + int i; result = gpgme_op_verify_result (ctx); @@ -991,7 +966,7 @@ static int show_sig_summary (unsigned long sum, const char *t0 = NULL, *t1 = NULL; gpgme_verify_result_t result; gpgme_signature_t sig; - unsigned int i; + int i; state_attach_puts (_("A system error occurred"), s); @@ -1284,18 +1259,17 @@ static int verify_one (BODY * sigbdy, STATE * s, if (!badsig) { gpgme_verify_result_t result; gpgme_sig_notation_t notation; - gpgme_signature_t signature; + gpgme_signature_t sig; result = gpgme_op_verify_result (ctx); if (result) { - for (signature = result->signatures; signature; - signature = signature->next) { - if (signature->notations) { + for (sig = result->signatures; sig; sig = sig->next) { + if (sig->notations) { state_attach_puts ("*** Begin Notation (signature by: ", s); - state_attach_puts (signature->fpr, s); + state_attach_puts (sig->fpr, s); state_attach_puts (") ***\n", s); - for (notation = signature->notations; notation; - notation = notation->next) { + for (notation = sig->notations; notation; notation = notation->next) + { if (notation->name) { state_attach_puts (notation->name, s); state_attach_puts ("=", s); @@ -1317,7 +1291,6 @@ static int verify_one (BODY * sigbdy, STATE * s, gpgme_release (ctx); state_attach_puts (_("[-- End signature information --]\n\n"), s); - debug_print (1, ("returning %d.\n", badsig)); return badsig ? 1 : anywarn ? 2 : 0; } @@ -1347,7 +1320,7 @@ static BODY *decrypt_part (BODY * a, STATE * s, FILE * fpout, int is_smime, { struct stat info; BODY *tattach; - int err; + int err = 0; gpgme_ctx_t ctx; gpgme_data_t ciphertext, plaintext; int maybe_signed = 0; @@ -1492,9 +1465,9 @@ int pgp_gpgme_decrypt_mime (FILE * fpin, FILE ** fpout, BODY * b, BODY ** cur) p_clear(&s, 1); s.fpin = fpin; - mutt_mktemp (tempfile); - if (!(*fpout = safe_fopen (tempfile, "w+"))) { - mutt_perror (tempfile); + *fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL); + if (!*fpout) { + mutt_perror (_("Can't create temporary file")); return -1; } unlink (tempfile); @@ -1518,7 +1491,7 @@ int smime_gpgme_decrypt_mime (FILE * fpin, FILE ** fpout, BODY * b, FILE *tmpfp = NULL; int is_signed; long saved_b_offset; - size_t saved_b_length; + ssize_t saved_b_length; int saved_b_type; if (!mutt_is_application_smime (b)) @@ -1537,9 +1510,9 @@ int smime_gpgme_decrypt_mime (FILE * fpin, FILE ** fpout, BODY * b, p_clear(&s, 1); s.fpin = fpin; fseeko (s.fpin, b->offset, 0); - mutt_mktemp (tempfile); - if (!(tmpfp = safe_fopen (tempfile, "w+"))) { - mutt_perror (tempfile); + tmpfp = m_tempfile (tempfile, sizeof(tempfile), NONULL(Tempdir), NULL); + if (!tmpfp) { + mutt_perror (_("Can't create temporary file")); return -1; } mutt_unlink (tempfile); @@ -1554,9 +1527,9 @@ int smime_gpgme_decrypt_mime (FILE * fpin, FILE ** fpout, BODY * b, p_clear(&s, 1); s.fpin = tmpfp; s.fpout = 0; - mutt_mktemp (tempfile); - if (!(*fpout = safe_fopen (tempfile, "w+"))) { - mutt_perror (tempfile); + *fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL); + if (!*fpout) { + mutt_perror (_("Can't create temporary file")); return -1; } mutt_unlink (tempfile); @@ -1567,7 +1540,7 @@ int smime_gpgme_decrypt_mime (FILE * fpin, FILE ** fpout, BODY * b, b->type = saved_b_type; b->length = saved_b_length; b->offset = saved_b_offset; - fclose (tmpfp); + m_fclose(&tmpfp); rewind (*fpout); if (*cur && !is_signed && !(*cur)->parts && mutt_is_application_smime (*cur)) { @@ -1589,9 +1562,9 @@ int smime_gpgme_decrypt_mime (FILE * fpin, FILE ** fpout, BODY * b, p_clear(&s, 1); s.fpin = *fpout; fseeko (s.fpin, bb->offset, 0); - mutt_mktemp (tempfile); - if (!(tmpfp = safe_fopen (tempfile, "w+"))) { - mutt_perror (tempfile); + tmpfp = m_tempfile (tempfile, sizeof(tempfile), NONULL(Tempdir), NULL); + if (!tmpfp) { + mutt_perror (_("Can't create temporary file")); return -1; } mutt_unlink (tempfile); @@ -1602,14 +1575,14 @@ int smime_gpgme_decrypt_mime (FILE * fpin, FILE ** fpout, BODY * b, bb->length = ftello (s.fpout); bb->offset = 0; rewind (tmpfp); - fclose (*fpout); + m_fclose(&*fpout); p_clear(&s, 1); s.fpin = tmpfp; s.fpout = 0; - mutt_mktemp (tempfile); - if (!(*fpout = safe_fopen (tempfile, "w+"))) { - mutt_perror (tempfile); + *fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL); + if (!*fpout) { + mutt_perror (_("Can't create temporary file")); return -1; } mutt_unlink (tempfile); @@ -1620,9 +1593,9 @@ int smime_gpgme_decrypt_mime (FILE * fpin, FILE ** fpout, BODY * b, bb->type = saved_b_type; bb->length = saved_b_length; bb->offset = saved_b_offset; - fclose (tmpfp); + m_fclose(&tmpfp); rewind (*fpout); - mutt_free_body (cur); + body_list_wipe(cur); *cur = tmp_b; } return *cur ? 0 : -1; @@ -1668,7 +1641,7 @@ static int pgp_check_traditional_one_body (FILE * fp, BODY * b, sgn = 1; } } - safe_fclose (&tfp); + m_fclose(&tfp); unlink (tempfile); if (!enc && !sgn) @@ -1676,10 +1649,9 @@ static int pgp_check_traditional_one_body (FILE * fp, BODY * b, /* fix the content type */ - mutt_set_parameter ("format", "fixed", &b->parameter); - mutt_set_parameter ("x-action", enc ? "pgp-encrypted" : "pgp-signed", - &b->parameter); - + parameter_setval(&b->parameter, "format", "fixed"); + parameter_setval(&b->parameter, "x-action", + enc ? "pgp-encrypted" : "pgp-signed"); return 1; } @@ -1722,7 +1694,7 @@ static void copy_clearsigned (gpgme_data_t data, STATE * s, char *charset) { char buf[HUGE_STRING]; short complete, armor_header; - FGETCONV *fc; + fgetconv_t *fc; char *fname; FILE *fp; @@ -1762,7 +1734,7 @@ static void copy_clearsigned (gpgme_data_t data, STATE * s, char *charset) } fgetconv_close (&fc); - fclose (fp); + m_fclose(&fp); } @@ -1785,8 +1757,6 @@ int pgp_gpgme_application_handler (BODY * m, STATE * s) char body_charset[STRING]; /* Only used for clearsigned messages. */ - debug_print (2, ("Entering pgp_application_pgp handler\n")); - /* For clearsigned messages we won't be able to get a character set but we know that this may only be text thus we assume Latin-1 here. */ @@ -1948,7 +1918,7 @@ int pgp_gpgme_application_handler (BODY * m, STATE * s) copy_clearsigned (armored_data, s, body_charset); } else if (pgpout) { - FGETCONV *fc; + fgetconv_t *fc; int c; rewind (pgpout); @@ -1972,7 +1942,7 @@ int pgp_gpgme_application_handler (BODY * m, STATE * s) } if (pgpout) { - safe_fclose (&pgpout); + m_fclose(&pgpout); } } else { @@ -1990,7 +1960,6 @@ int pgp_gpgme_application_handler (BODY * m, STATE * s) " of PGP message! --]\n\n"), s); return (-1); } - debug_print (2, ("Leaving pgp_application_pgp handler\n")); return (err); } @@ -2008,7 +1977,6 @@ int pgp_gpgme_encrypted_handler (BODY * a, STATE * s) int is_signed; int rc = 0; - debug_print (2, ("Entering pgp_encrypted handler\n")); a = a->parts; if (!a || a->type != TYPEAPPLICATION || !a->subtype || ascii_strcasecmp ("pgp-encrypted", a->subtype) @@ -2023,8 +1991,8 @@ int pgp_gpgme_encrypted_handler (BODY * a, STATE * s) /* Move forward to the application/pgp-encrypted body. */ a = a->next; - mutt_mktemp (tempfile); - if (!(fpout = safe_fopen (tempfile, "w+"))) { + fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL); + if (!fpout) { if (s->flags & M_DISPLAY) state_attach_puts (_("[-- Error: could not create temporary file! " "--]\n"), s); @@ -2065,12 +2033,11 @@ int pgp_gpgme_encrypted_handler (BODY * a, STATE * s) : _("[-- End of PGP/MIME encrypted data --]\n"), s); } - mutt_free_body (&tattach); + body_list_wipe(&tattach); } - fclose (fpout); + m_fclose(&fpout); mutt_unlink (tempfile); - debug_print (2, ("Leaving pgp_encrypted handler\n")); return (rc); } @@ -2083,11 +2050,9 @@ int smime_gpgme_application_handler (BODY * a, STATE * s) int is_signed; int rc = 0; - debug_print (2, ("Entering smime_encrypted handler\n")); - a->warnsig = 0; - mutt_mktemp (tempfile); - if (!(fpout = safe_fopen (tempfile, "w+"))) { + fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL); + if (!fpout) { if (s->flags & M_DISPLAY) state_attach_puts (_("[-- Error: could not create temporary file! " "--]\n"), s); @@ -2132,12 +2097,11 @@ int smime_gpgme_application_handler (BODY * a, STATE * s) _("[-- End of S/MIME encrypted data --]\n"), s); } - mutt_free_body (&tattach); + body_list_wipe(&tattach); } - fclose (fpout); + m_fclose(&fpout); mutt_unlink (tempfile); - debug_print (2, ("Leaving smime_encrypted handler\n")); return (rc); } @@ -2157,14 +2121,11 @@ int smime_gpgme_application_handler (BODY * a, STATE * s) * %[...] date of key using strftime(3) */ -static const char *crypt_entry_fmt (char *dest, - size_t destlen, - char op, - const char *src, - const char *prefix, - const char *ifstring, - const char *elsestring, - unsigned long data, format_flag flags) +static const char * +crypt_entry_fmt (char *dest, ssize_t destlen, char op, + const char *src, const char *prefix, + const char *ifstring, const char *elsestring, + unsigned long data, format_flag flags) { char fmt[16]; crypt_entry_t *entry; @@ -2190,7 +2151,7 @@ static const char *crypt_entry_fmt (char *dest, char buf2[SHORT_STRING], *p; int do_locales; struct tm *tm; - size_t len; + ssize_t len; p = dest; @@ -2305,7 +2266,7 @@ static const char *crypt_entry_fmt (char *dest, s = "x"; else { gpgme_user_id_t uid = NULL; - unsigned int i = 0; + int i = 0; for (i = 0, uid = key->kobj->uids; uid && (i < key->idx); i++, uid = uid->next); @@ -2353,7 +2314,7 @@ static const char *crypt_entry_fmt (char *dest, } /* Used by the display fucntion to format a line. */ -static void crypt_entry (char *s, size_t l, MUTTMENU * menu, int num) +static void crypt_entry (char *s, ssize_t l, MUTTMENU * menu, int num) { crypt_key_t **key_table = (crypt_key_t **) menu->data; crypt_entry_t entry; @@ -2532,7 +2493,7 @@ static const unsigned char *parse_dn_part (struct dn_array_s *array, const unsigned char *string) { const unsigned char *s, *s1; - size_t n; + ssize_t n; unsigned char *p; /* parse attributeType */ @@ -2611,7 +2572,7 @@ static const unsigned char *parse_dn_part (struct dn_array_s *array, static struct dn_array_s *parse_dn (const unsigned char *string) { struct dn_array_s *array; - size_t arrayidx, arraysize; + ssize_t arrayidx, arraysize; int i; arraysize = 7; /* C,ST,L,O,OU,CN,email */ @@ -2962,10 +2923,9 @@ static void verify_key (crypt_key_t * key) gpgme_key_t k = NULL; int maxdepth = 100; - mutt_mktemp (tempfile); - if (!(fp = safe_fopen (tempfile, "w"))) { + fp = m_tempfile (tempfile, sizeof(tempfile), NONULL(Tempdir), NULL); + if (!fp) { mutt_perror (_("Can't create temporary file")); - return; } mutt_message _("Collecting data..."); @@ -3007,7 +2967,7 @@ static void verify_key (crypt_key_t * key) leave: gpgme_key_release (k); gpgme_release (listctx); - fclose (fp); + m_fclose(&fp); mutt_clear_error (); snprintf (cmd, sizeof (cmd), _("Key ID: 0x%s"), crypt_keyid (key)); mutt_do_pager (cmd, tempfile, 0, NULL); @@ -3018,15 +2978,15 @@ leave: */ -/* Convert LIST into a pattern string suitable to be passed to GPGME. +/* Convert string_list_t into a pattern string suitable to be passed to GPGME. We need to convert spaces in an item into a '+' and '%' into "%25". */ -static char *list_to_pattern (LIST * list) +static char *list_to_pattern (string_list_t * list) { - LIST *l; + string_list_t *l; char *pattern, *p; const char *s; - size_t n; + ssize_t n; n = 0; for (l = list; l; l = l->next) { @@ -3068,7 +3028,7 @@ static char *list_to_pattern (LIST * list) /* Return a list of keys which are candidates for the selection. Select by looking at the HINTS list. */ -static crypt_key_t *get_candidates (LIST * hints, unsigned int app, +static crypt_key_t *get_candidates (string_list_t * hints, unsigned int app, int secret) { crypt_key_t *db, *k, **kend; @@ -3098,8 +3058,8 @@ static crypt_key_t *get_candidates (LIST * hints, unsigned int app, depending on the protocol. For gpg we don' t need percent escaped pappert but simple strings passed in an array to the keylist_ext_start function. */ - LIST *l; - size_t n; + string_list_t *l; + ssize_t n; char **patarr; for (l = hints, n = 0; l; l = l->next) { @@ -3212,7 +3172,7 @@ static crypt_key_t *get_candidates (LIST * hints, unsigned int app, /* Add the string STR to the list HINTS. This list is later used to match addresses. */ -static LIST *crypt_add_string_to_hints (LIST * hints, const char *str) +static string_list_t *crypt_add_string_to_hints (string_list_t * hints, const char *str) { char *scratch; char *t; @@ -3369,7 +3329,7 @@ static crypt_key_t *crypt_select_key (crypt_key_t * keys, else { gpgme_validity_t val = GPGME_VALIDITY_UNKNOWN; gpgme_user_id_t uid = NULL; - unsigned int j = 0; + int j = 0; warn_s = "??"; @@ -3429,7 +3389,7 @@ static crypt_key_t *crypt_getkeybyaddr (address_t * a, short abilities, unsigned int app, int *forced_valid) { address_t *r, *p; - LIST *hints = NULL; + string_list_t *hints = NULL; int weak = 0; int invalid = 0; @@ -3454,18 +3414,13 @@ static crypt_key_t *crypt_getkeybyaddr (address_t * a, short abilities, mutt_message (_("Looking for keys matching \"%s\"..."), a->mailbox); keys = get_candidates (hints, app, (abilities & KEYFLAG_CANSIGN)); - mutt_free_list (&hints); + string_list_wipe(&hints); if (!keys) return NULL; - debug_print (5, ("looking for %s <%s>.\n", a->personal, a->mailbox)); - for (k = keys; k; k = k->next) { - debug_print (5, (" looking at key: %s `%.15s'\n", crypt_keyid (k), k->uid)); - if (abilities && !(k->flags & abilities)) { - debug_print (5, (" insufficient abilities: Has %x, want %x\n", k->flags, abilities)); continue; } @@ -3498,7 +3453,7 @@ static crypt_key_t *crypt_getkeybyaddr (address_t * a, short abilities, || !(validity & CRYPT_KV_ADDR))) this_key_has_weak = 1; } - address_delete (&r); + address_list_wipe(&r); if (match) { crypt_key_t *tmp; @@ -3543,10 +3498,10 @@ static crypt_key_t *crypt_getkeybyaddr (address_t * a, short abilities, } -static crypt_key_t *crypt_getkeybystr (char *p, short abilities, +static crypt_key_t *crypt_getkeybystr (const char *p, short abilities, unsigned int app, int *forced_valid) { - LIST *hints = NULL; + string_list_t *hints = NULL; crypt_key_t *keys; crypt_key_t *matches = NULL; crypt_key_t **matches_endp = &matches; @@ -3559,7 +3514,7 @@ static crypt_key_t *crypt_getkeybystr (char *p, short abilities, hints = crypt_add_string_to_hints (hints, p); keys = get_candidates (hints, app, (abilities & KEYFLAG_CANSIGN)); - mutt_free_list (&hints); + string_list_wipe(&hints); if (!keys) return NULL; @@ -3569,7 +3524,6 @@ static crypt_key_t *crypt_getkeybystr (char *p, short abilities, continue; match = 0; - debug_print (5, ("matching \"%s\" against " "key %s, \"%s\":\n", p, crypt_keyid (k), k->uid)); if (!*p || !m_strcasecmp(p, crypt_keyid (k)) || (!m_strncasecmp(p, "0x", 2) @@ -3580,8 +3534,6 @@ static crypt_key_t *crypt_getkeybystr (char *p, short abilities, || m_stristr(k->uid, p)) { crypt_key_t *tmp; - debug_print (5, ("match.\n")); - *matches_endp = tmp = crypt_copy_key (k); matches_endp = &tmp->next; } @@ -3660,9 +3612,10 @@ static crypt_key_t *crypt_ask_for_key (char *tag, static char *find_keys (address_t * to, address_t * cc, address_t * bcc, unsigned int app) { - char *keyID, *keylist = NULL, *t; - size_t keylist_size = 0; - size_t keylist_used = 0; + char *keylist = NULL, *t; + const char *keyID; + ssize_t keylist_size = 0; + ssize_t keylist_used = 0; address_t *tmp = NULL, *addr = NULL; address_t **last = &tmp; address_t *p, *q; @@ -3697,7 +3650,7 @@ static char *find_keys (address_t * to, address_t * cc, address_t * bcc, if (fqdn) rfc822_qualify (tmp, fqdn); - tmp = mutt_remove_duplicates (tmp); + address_list_uniq(tmp); for (p = tmp; p; p = p->next) { char buf[LONG_STRING]; @@ -3720,19 +3673,14 @@ static char *find_keys (address_t * to, address_t * cc, address_t * bcc, q = addr; } else { -#if 0 - k_info = crypt_getkeybystr (keyID, KEYFLAG_CANENCRYPT, - *r_application, &forced_valid); -#else k_info = crypt_getkeybystr (keyID, KEYFLAG_CANENCRYPT, app, &forced_valid); -#endif } } else if (r == -1) { p_delete(&keylist); - address_delete (&tmp); - address_delete (&addr); + address_list_wipe(&tmp); + address_list_wipe(&addr); return NULL; } } @@ -3743,15 +3691,11 @@ static char *find_keys (address_t * to, address_t * cc, address_t * bcc, snprintf (buf, sizeof (buf), _("Enter keyID for %s: "), q->mailbox); if ((key = crypt_ask_for_key (buf, q->mailbox, KEYFLAG_CANENCRYPT, -#if 0 - *r_application, -#else app, -#endif &forced_valid)) == NULL) { p_delete(&keylist); - address_delete (&tmp); - address_delete (&addr); + address_list_wipe(&tmp); + address_list_wipe(&addr); return NULL; } } @@ -3761,13 +3705,6 @@ static char *find_keys (address_t * to, address_t * cc, address_t * bcc, { const char *s = crypt_fpr (key); -#if 0 - if (key->flags & KEYFLAG_ISX509) - *r_application &= ~APPLICATION_PGP; - if (!(key->flags & KEYFLAG_ISX509)) - *r_application &= ~APPLICATION_SMIME; -#endif - keylist_size += m_strlen(s) + 4 + 1; p_realloc(&keylist, keylist_size); sprintf (keylist + keylist_used, "%s0x%s%s", /* __SPRINTF_CHECKED__ */ @@ -3776,9 +3713,9 @@ static char *find_keys (address_t * to, address_t * cc, address_t * bcc, keylist_used = m_strlen(keylist); crypt_free_key (&key); - address_delete (&addr); + address_list_wipe(&addr); } - address_delete (&tmp); + address_list_wipe(&tmp); return (keylist); } @@ -3861,11 +3798,6 @@ static int gpgme_send_menu (HEADER * msg, int *redraw, int is_smime) msg->security |= (is_smime ? SMIMESIGN : PGPSIGN); } -#if 0 - else { - msg->security &= (is_smime ? ~SMIMESIGN : ~PGPSIGN); - } -#endif *redraw = REDRAW_FULL; break; @@ -3906,7 +3838,7 @@ int smime_gpgme_send_menu (HEADER * msg, int *redraw) return gpgme_send_menu (msg, redraw, 1); } -static int verify_sender (HEADER * h, gpgme_protocol_t protocol) +static int verify_sender (HEADER * h, gpgme_protocol_t protocol __attribute__((unused))) { address_t *sender = NULL; unsigned int ret = 1;