#ifdef CRYPT_BACKEND_GPGME
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
+
+#include <lib-mime/mime.h>
+
#include "mutt.h"
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
#include "mutt_menu.h"
#include "mutt_curses.h"
-#include "mime.h"
+#include "handler.h"
+#include "enter.h"
#include "copy.h"
#include "pager.h"
+#include "recvattach.h"
#include "sort.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
+#include "lib/debug.h"
#include <sys/wait.h>
#include <string.h>
* General helper functions.
*/
-/* return true when S pints to a didgit or letter. */
+/* return true when S points to a didgit or letter. */
static int digit_or_letter (const unsigned char *s)
{
- return ((*s >= '0' && *s < '9')
+ return ((*s >= '0' && *s <= '9')
|| (*s >= 'A' && *s <= 'Z')
|| (*s >= 'a' && *s <= 'z'));
}
{
char *tstr;
- tstr = safe_malloc (len + 1);
- memcpy (tstr, buf, len);
- tstr[len] = 0;
+ tstr = p_dupstr(buf, len);
mutt_convert_string (&tstr, "utf-8", Charset, M_ICONV_HOOK_FROM);
fputs (tstr, fp);
- FREE (&tstr);
+ p_delete(&tstr);
}
if (k->kobj && k->kobj->subkeys) {
s = k->kobj->subkeys->keyid;
- if ((!option (OPTPGPLONGIDS)) && (safe_strlen (s) == 16))
+ if ((!option (OPTPGPLONGIDS)) && (m_strlen(s) == 16))
/* Return only the short keyID. */
s += 8;
}
}
/* Return a copy of KEY. */
-static crypt_key_t *crypt_copy_key (crypt_key_t * key)
+static crypt_key_t *crypt_copy_key (crypt_key_t *key)
{
crypt_key_t *k;
- k = safe_calloc (1, sizeof *k);
+ k = p_new(crypt_key_t, 1);
k->kobj = key->kobj;
gpgme_key_ref (key->kobj);
k->idx = key->idx;
while (*keylist) {
crypt_key_t *k = (*keylist)->next;
- FREE (&k);
+ p_delete(&k);
*keylist = k;
}
}
/* Return a bit vector describing how well the addresses ADDR and
U_ADDR match and whether KEY is valid. */
-static int crypt_id_matches_addr (ADDRESS * addr, ADDRESS * u_addr,
+static int crypt_id_matches_addr (address_t * addr, address_t * u_addr,
crypt_key_t * key)
{
int rv = 0;
rv |= CRYPT_KV_STRONGID;
if (addr->mailbox && u_addr->mailbox
- && safe_strcasecmp (addr->mailbox, u_addr->mailbox) == 0)
+ && m_strcasecmp(addr->mailbox, u_addr->mailbox) == 0)
rv |= CRYPT_KV_ADDR;
if (addr->personal && u_addr->personal
- && safe_strcasecmp (addr->personal, u_addr->personal) == 0)
+ && m_strcasecmp(addr->personal, u_addr->personal) == 0)
rv |= CRYPT_KV_STRING;
return rv;
err = gpgme_new (&ctx);
if (err) {
- mutt_error ("error creating gpgme context: %s\n", gpgme_strerror (err));
+ mutt_error (_("error creating gpgme context: %s\n"), gpgme_strerror (err));
sleep (2);
mutt_exit (1);
}
if (for_smime) {
err = gpgme_set_protocol (ctx, GPGME_PROTOCOL_CMS);
if (err) {
- mutt_error ("error enabling CMS protocol: %s\n", gpgme_strerror (err));
+ mutt_error (_("error enabling CMS protocol: %s\n"), gpgme_strerror (err));
sleep (2);
mutt_exit (1);
}
err = gpgme_data_new (&data);
if (err) {
- mutt_error ("error creating gpgme data object: %s\n",
+ mutt_error (_("error creating gpgme data object: %s\n"),
gpgme_strerror (err));
sleep (2);
mutt_exit (1);
}
unlink (tempfile);
if (err) {
- mutt_error ("error allocating data object: %s\n", gpgme_strerror (err));
+ mutt_error (_("error allocating data object: %s\n"), gpgme_strerror (err));
return NULL;
}
err = gpgme_data_new_from_filepart (&data, NULL, fp, offset, length);
if (err) {
- mutt_error ("error allocating data object: %s\n", gpgme_strerror (err));
+ mutt_error (_("error allocating data object: %s\n"), gpgme_strerror (err));
return NULL;
}
err = ((gpgme_data_seek (data, 0, SEEK_SET) == -1)
? gpgme_error_from_errno (errno) : 0);
if (err) {
- mutt_error ("error rewinding data object: %s\n", gpgme_strerror (err));
+ mutt_error (_("error rewinding data object: %s\n"), gpgme_strerror (err));
return -1;
}
}
}
if (nread == -1) {
- mutt_error ("error reading data object: %s\n", strerror (errno));
+ mutt_error (_("error reading data object: %s\n"), strerror (errno));
return -1;
}
return 0;
else
fclose (fp);
if (nread == -1) {
- mutt_error ("error reading data object: %s\n", gpgme_strerror (err));
+ mutt_error (_("error reading data object: %s\n"), gpgme_strerror (err));
unlink (tempfile);
fclose (fp);
return NULL;
}
if (ret_fp)
*ret_fp = fp;
- return safe_strdup (tempfile);
+ return m_strdup(tempfile);
}
err = gpgme_get_key (context, buf, &key, 0);
if (!err) {
- safe_realloc (&rset, sizeof (*rset) * (rset_n + 1));
+ p_realloc(&rset, rset_n + 1);
rset[rset_n++] = key;
}
else {
- mutt_error ("error adding recipient `%s': %s\n",
+ mutt_error (_("error adding recipient `%s': %s\n"),
buf, gpgme_strerror (err));
- FREE (&rset);
+ p_delete(&rset);
return NULL;
}
}
}
/* NULL terminate. */
- safe_realloc (&rset, sizeof (*rset) * (rset_n + 1));
+ p_realloc(&rset, rset_n + 1);
rset[rset_n++] = NULL;
if (context)
gpgme_key_release (key);
gpgme_key_release (key2);
gpgme_release (listctx);
- mutt_error (_("ambiguous specfication of secret key `%s'\n"), signid);
+ mutt_error (_("ambiguous specification of secret key `%s'\n"), signid);
return -1;
}
gpgme_op_keylist_end (listctx);
plaintext, ciphertext);
mutt_need_hard_redraw ();
if (err) {
- mutt_error ("error encrypting data: %s\n", gpgme_strerror (err));
+ mutt_error (_("error encrypting data: %s\n"), gpgme_strerror (err));
gpgme_data_release (ciphertext);
gpgme_release (ctx);
return NULL;
if (result) {
algorithm_name = gpgme_hash_algo_name (result->signatures->hash_algo);
if (algorithm_name) {
- strncpy (buf, algorithm_name, buflen - 1);
- buf[buflen - 1] = 0;
+ m_strcpy(buf, buflen, algorithm_name);
}
}
if (err) {
gpgme_data_release (signature);
gpgme_release (ctx);
- mutt_error ("error signing data: %s\n", gpgme_strerror (err));
+ mutt_error (_("error signing data: %s\n"), gpgme_strerror (err));
return NULL;
}
t = mutt_new_body ();
t->type = TYPEMULTIPART;
- t->subtype = safe_strdup ("signed");
+ t->subtype = m_strdup("signed");
t->encoding = ENC7BIT;
t->use_disp = 0;
t->disposition = DISPINLINE;
t = t->parts->next;
t->type = TYPEAPPLICATION;
if (use_smime) {
- t->subtype = safe_strdup ("pkcs7-signature");
+ t->subtype = m_strdup("pkcs7-signature");
mutt_set_parameter ("name", "smime.p7s", &t->parameter);
t->encoding = ENCBASE64;
t->use_disp = 1;
t->disposition = DISPATTACH;
- t->d_filename = safe_strdup ("smime.p7s");
+ t->d_filename = m_strdup("smime.p7s");
}
else {
- t->subtype = safe_strdup ("pgp-signature");
+ t->subtype = m_strdup("pgp-signature");
t->use_disp = 0;
t->disposition = DISPINLINE;
t->encoding = ENC7BIT;
convert_to_7bit (a);
plaintext = body_to_data_object (a, 0);
if (!plaintext) {
- FREE (&rset);
+ p_delete(&rset);
return NULL;
}
outfile = encrypt_gpgme_object (plaintext, rset, 0, sign);
gpgme_data_release (plaintext);
- FREE (&rset);
+ p_delete(&rset);
if (!outfile)
return NULL;
t = mutt_new_body ();
t->type = TYPEMULTIPART;
- t->subtype = safe_strdup ("encrypted");
+ t->subtype = m_strdup("encrypted");
t->encoding = ENC7BIT;
t->use_disp = 0;
t->disposition = DISPINLINE;
t->parts = mutt_new_body ();
t->parts->type = TYPEAPPLICATION;
- t->parts->subtype = safe_strdup ("pgp-encrypted");
+ t->parts->subtype = m_strdup("pgp-encrypted");
t->parts->encoding = ENC7BIT;
t->parts->next = mutt_new_body ();
t->parts->next->type = TYPEAPPLICATION;
- t->parts->next->subtype = safe_strdup ("octet-stream");
+ t->parts->next->subtype = m_strdup("octet-stream");
t->parts->next->encoding = ENC7BIT;
t->parts->next->filename = outfile;
t->parts->next->use_disp = 1;
t->parts->next->disposition = DISPINLINE;
t->parts->next->unlink = 1; /* delete after sending the message */
- t->parts->next->d_filename = safe_strdup ("msg.asc"); /* non pgp/mime
+ t->parts->next->d_filename = m_strdup("msg.asc"); /* non pgp/mime
can save */
return t;
plaintext = body_to_data_object (a, 0);
if (!plaintext) {
- FREE (&rset);
+ p_delete(&rset);
return NULL;
}
outfile = encrypt_gpgme_object (plaintext, rset, 1, 0);
gpgme_data_release (plaintext);
- FREE (&rset);
+ p_delete(&rset);
if (!outfile)
return NULL;
t = mutt_new_body ();
t->type = TYPEAPPLICATION;
- t->subtype = safe_strdup ("pkcs7-mime");
+ t->subtype = m_strdup("pkcs7-mime");
mutt_set_parameter ("name", "smime.p7m", &t->parameter);
mutt_set_parameter ("smime-type", "enveloped-data", &t->parameter);
t->encoding = ENCBASE64; /* The output of OpenSSL SHOULD be binary */
t->use_disp = 1;
t->disposition = DISPATTACH;
- t->d_filename = safe_strdup ("smime.p7m");
+ t->d_filename = m_strdup("smime.p7m");
t->filename = outfile;
t->unlink = 1; /*delete after sending the message */
t->parts = 0;
gpgme_signature_t sig;
unsigned int i;
- state_attach_puts (_("A system error occured"), s);
+ state_attach_puts (_("A system error occurred"), s);
/* Try to figure out some more detailed system error information. */
result = gpgme_op_verify_result (ctx);
state_attach_puts (": ", s);
if (t0)
state_attach_puts (t0, s);
- if (t1 && !(t0 && !safe_strcmp (t0, t1))) {
+ if (t1 && !(t0 && !m_strcmp(t0, t1))) {
if (t0)
state_attach_puts (",", s);
state_attach_puts (t1, s);
return;
is_pgp = (key->protocol == GPGME_PROTOCOL_OpenPGP);
- buf = safe_malloc (safe_strlen (prefix) + safe_strlen (s) * 4 + 2);
+ buf = xmalloc(m_strlen(prefix) + m_strlen(s) * 4 + 2);
strcpy (buf, prefix); /* __STRCPY_CHECKED__ */
- p = buf + safe_strlen (buf);
- if (is_pgp && safe_strlen (s) == 40) { /* PGP v4 style formatted. */
+ p = buf + m_strlen(buf);
+ if (is_pgp && m_strlen(s) == 40) { /* PGP v4 style formatted. */
for (i = 0; *s && s[1] && s[2] && s[3] && s[4]; s += 4, i++) {
*p++ = s[0];
*p++ = s[1];
*p++ = '\n';
*p = 0;
state_attach_puts (buf, state);
- FREE (&buf);
+ p_delete(&buf);
}
/* Show the valididy of a key used for one signature. */
err = gpgme_data_new_from_file (&message, tempfile, 1);
if (err) {
gpgme_data_release (signature);
- mutt_error ("error allocating data object: %s\n", gpgme_strerror (err));
+ mutt_error (_("error allocating data object: %s\n"), gpgme_strerror (err));
return -1;
}
ctx = create_gpgme_context (is_smime);
if (notation->value) {
state_attach_puts (notation->value, s);
if (!(*notation->value
- && (notation->value[safe_strlen (notation->value) - 1] ==
+ && (notation->value[m_strlen(notation->value) - 1] ==
'\n')))
state_attach_puts ("\n", s);
}
gpgme_release (ctx);
state_attach_puts (_("[-- End signature information --]\n\n"), s);
- dprint (1, (debugfile, "verify_one: returning %d.\n", badsig));
+ debug_print (1, ("returning %d.\n", badsig));
return badsig ? 1 : anywarn ? 2 : 0;
}
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+"))) {
saved_b_type = b->type;
saved_b_offset = b->offset;
saved_b_length = b->length;
- memset (&s, 0, sizeof (s));
+ p_clear(&s, 1);
s.fpin = fpin;
- fseek (s.fpin, b->offset, 0);
+ fseeko (s.fpin, b->offset, 0);
mutt_mktemp (tempfile);
if (!(tmpfp = safe_fopen (tempfile, "w+"))) {
mutt_perror (tempfile);
s.fpout = tmpfp;
mutt_decode_attachment (b, &s);
fflush (tmpfp);
- b->length = ftell (s.fpout);
+ b->length = ftello (s.fpout);
b->offset = 0;
rewind (tmpfp);
- memset (&s, 0, sizeof (s));
+ p_clear(&s, 1);
s.fpin = tmpfp;
s.fpout = 0;
mutt_mktemp (tempfile);
saved_b_type = bb->type;
saved_b_offset = bb->offset;
saved_b_length = bb->length;
- memset (&s, 0, sizeof (s));
+ p_clear(&s, 1);
s.fpin = *fpout;
- fseek (s.fpin, bb->offset, 0);
+ fseeko (s.fpin, bb->offset, 0);
mutt_mktemp (tempfile);
if (!(tmpfp = safe_fopen (tempfile, "w+"))) {
mutt_perror (tempfile);
s.fpout = tmpfp;
mutt_decode_attachment (bb, &s);
fflush (tmpfp);
- bb->length = ftell (s.fpout);
+ bb->length = ftello (s.fpout);
bb->offset = 0;
rewind (tmpfp);
fclose (*fpout);
- memset (&s, 0, sizeof (s));
+ p_clear(&s, 1);
s.fpin = tmpfp;
s.fpout = 0;
mutt_mktemp (tempfile);
}
while (fgets (buf, sizeof (buf), tfp)) {
- if (!safe_strncmp ("-----BEGIN PGP ", buf, 15)) {
- if (!safe_strcmp ("MESSAGE-----\n", buf + 15))
+ if (!m_strncmp("-----BEGIN PGP ", buf, 15)) {
+ if (!m_strcmp("MESSAGE-----\n", buf + 15))
enc = 1;
- else if (!safe_strcmp ("SIGNED MESSAGE-----\n", buf + 15))
+ else if (!m_strcmp("SIGNED MESSAGE-----\n", buf + 15))
sgn = 1;
}
}
if (!fname)
return;
unlink (fname);
- FREE (&fname);
+ p_delete(&fname);
fc = fgetconv_open (fp, charset, Charset, M_ICONV_HOOK_FROM);
continue;
}
- if (!safe_strcmp (buf, "-----BEGIN PGP SIGNATURE-----\n"))
+ if (!m_strcmp(buf, "-----BEGIN PGP SIGNATURE-----\n"))
break;
if (armor_header) {
/* Support for classic_application/pgp */
-void pgp_gpgme_application_handler (BODY * m, STATE * s)
+int pgp_gpgme_application_handler (BODY * m, STATE * s)
{
int needpass = -1, pgp_keyblock = 0;
int clearsign = 0;
long start_pos = 0;
- long bytes, last_pos, offset;
+ long bytes;
+ off_t last_pos, offset;
char buf[HUGE_STRING];
FILE *pgpout = NULL;
- gpgme_error_t err;
+ gpgme_error_t err = 0;
gpgme_data_t armored_data = NULL;
short maybe_goodsig = 1;
char body_charset[STRING]; /* Only used for clearsigned messages. */
- dprint (2, (debugfile, "Entering pgp_application_pgp handler\n"));
+ 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. */
if (!mutt_get_body_charset (body_charset, sizeof (body_charset), m))
- strfcpy (body_charset, "iso-8859-1", sizeof body_charset);
+ m_strcpy(body_charset, sizeof(body_charset), "iso-8859-1");
- fseek (s->fpin, m->offset, 0);
+ fseeko (s->fpin, m->offset, 0);
last_pos = m->offset;
for (bytes = m->length; bytes > 0;) {
if (fgets (buf, sizeof (buf), s->fpin) == NULL)
break;
- offset = ftell (s->fpin);
- bytes -= (offset - last_pos); /* don't rely on safe_strlen(buf) */
+ offset = ftello (s->fpin);
+ bytes -= (offset - last_pos); /* don't rely on m_strlen(buf) */
last_pos = offset;
- if (!safe_strncmp ("-----BEGIN PGP ", buf, 15)) {
+ if (!m_strncmp("-----BEGIN PGP ", buf, 15)) {
clearsign = 0;
start_pos = last_pos;
- if (!safe_strcmp ("MESSAGE-----\n", buf + 15))
+ if (!m_strcmp("MESSAGE-----\n", buf + 15))
needpass = 1;
- else if (!safe_strcmp ("SIGNED MESSAGE-----\n", buf + 15)) {
+ else if (!m_strcmp("SIGNED MESSAGE-----\n", buf + 15)) {
clearsign = 1;
needpass = 0;
}
else if (!option (OPTDONTHANDLEPGPKEYS) &&
- !safe_strcmp ("PUBLIC KEY BLOCK-----\n", buf + 15)) {
+ !m_strcmp("PUBLIC KEY BLOCK-----\n", buf + 15)) {
needpass = 0;
pgp_keyblock = 1;
}
/* Copy PGP material to an data container */
armored_data = create_gpgme_data ();
- gpgme_data_write (armored_data, buf, safe_strlen (buf));
+ gpgme_data_write (armored_data, buf, m_strlen(buf));
while (bytes > 0 && fgets (buf, sizeof (buf) - 1, s->fpin) != NULL) {
- offset = ftell (s->fpin);
- bytes -= (offset - last_pos); /* don't rely on safe_strlen(buf) */
+ offset = ftello (s->fpin);
+ bytes -= (offset - last_pos); /* don't rely on m_strlen(buf) */
last_pos = offset;
- gpgme_data_write (armored_data, buf, safe_strlen (buf));
+ gpgme_data_write (armored_data, buf, m_strlen(buf));
- if ((needpass && !safe_strcmp ("-----END PGP MESSAGE-----\n", buf))
+ if ((needpass && !m_strcmp("-----END PGP MESSAGE-----\n", buf))
|| (!needpass
- && (!safe_strcmp ("-----END PGP SIGNATURE-----\n", buf)
- || !safe_strcmp ("-----END PGP PUBLIC KEY BLOCK-----\n",
+ && (!m_strcmp("-----END PGP SIGNATURE-----\n", buf)
+ || !m_strcmp("-----END PGP PUBLIC KEY BLOCK-----\n",
buf))))
break;
}
}
else {
unlink (tmpfname);
- FREE (&tmpfname);
+ p_delete(&tmpfname);
}
}
gpgme_release (ctx);
if (needpass == -1) {
state_attach_puts (_("[-- Error: could not find beginning"
" of PGP message! --]\n\n"), s);
- return;
+ return (-1);
}
- dprint (2, (debugfile, "Leaving pgp_application_pgp handler\n"));
+ debug_print (2, ("Leaving pgp_application_pgp handler\n"));
+ return (err);
}
/*
*/
/* MIME handler for pgp/mime encrypted messages. */
-void pgp_gpgme_encrypted_handler (BODY * a, STATE * s)
+int pgp_gpgme_encrypted_handler (BODY * a, STATE * s)
{
char tempfile[_POSIX_PATH_MAX];
FILE *fpout;
BODY *tattach;
BODY *orig_body = a;
int is_signed;
+ int rc = 0;
- dprint (2, (debugfile, "Entering pgp_encrypted handler\n"));
+ debug_print (2, ("Entering pgp_encrypted handler\n"));
a = a->parts;
if (!a || a->type != TYPEAPPLICATION || !a->subtype
|| ascii_strcasecmp ("pgp-encrypted", a->subtype)
if (s->flags & M_DISPLAY)
state_attach_puts (_("[-- Error: malformed PGP/MIME message! --]\n\n"),
s);
- return;
+ return (-1);
}
/* Move forward to the application/pgp-encrypted body. */
if (s->flags & M_DISPLAY)
state_attach_puts (_("[-- Error: could not create temporary file! "
"--]\n"), s);
- return;
+ return (-1);
}
tattach = decrypt_part (a, s, fpout, 0, &is_signed);
if (s->flags & M_DISPLAY)
state_attach_puts (is_signed ?
_
- ("[-- The following data is PGP/MIME signed and encrypted --]\n\n")
- :
- _
- ("[-- The following data is PGP/MIME encrypted --]\n\n"),
- s);
+ ("[-- The following data is PGP/MIME signed and encrypted --]\n\n") :
+ _("[-- The following data is PGP/MIME encrypted --]\n\n"), s);
{
FILE *savefp = s->fpin;
s->fpin = fpout;
- mutt_body_handler (tattach, s);
+ rc = mutt_body_handler (tattach, s);
s->fpin = savefp;
}
fclose (fpout);
mutt_unlink (tempfile);
- dprint (2, (debugfile, "Leaving pgp_encrypted handler\n"));
+ debug_print (2, ("Leaving pgp_encrypted handler\n"));
+ return (rc);
}
/* Support for application/smime */
-void smime_gpgme_application_handler (BODY * a, STATE * s)
+int smime_gpgme_application_handler (BODY * a, STATE * s)
{
char tempfile[_POSIX_PATH_MAX];
FILE *fpout;
BODY *tattach;
int is_signed;
+ int rc = 0;
-
- dprint (2, (debugfile, "Entering smime_encrypted handler\n"));
+ debug_print (2, ("Entering smime_encrypted handler\n"));
a->warnsig = 0;
mutt_mktemp (tempfile);
if (s->flags & M_DISPLAY)
state_attach_puts (_("[-- Error: could not create temporary file! "
"--]\n"), s);
- return;
+ return (-1);
}
tattach = decrypt_part (a, s, fpout, 1, &is_signed);
if (s->flags & M_DISPLAY)
state_attach_puts (is_signed ?
- _("[-- The following data is S/MIME signed --]\n\n")
- :
- _
- ("[-- The following data is S/MIME encrypted --]\n\n"),
- s);
+ _("[-- The following data is S/MIME signed --]\n\n") :
+ _("[-- The following data is S/MIME encrypted --]\n\n"), s);
{
FILE *savefp = s->fpin;
s->fpin = fpout;
- mutt_body_handler (tattach, s);
+ rc = mutt_body_handler (tattach, s);
s->fpin = savefp;
}
fclose (fpout);
mutt_unlink (tempfile);
- dprint (2, (debugfile, "Leaving smime_encrypted handler\n"));
+ debug_print (2, ("Leaving smime_encrypted handler\n"));
+ return (rc);
}
crypt_key_t **t = (crypt_key_t **) b;
int r;
- if ((r = safe_strcasecmp ((*s)->uid, (*t)->uid)))
+ if ((r = m_strcasecmp((*s)->uid, (*t)->uid)))
return r > 0;
else
- return safe_strcasecmp (crypt_keyid (*s), crypt_keyid (*t)) > 0;
+ return m_strcasecmp(crypt_keyid (*s), crypt_keyid (*t)) > 0;
}
static int crypt_compare_address (const void *a, const void *b)
crypt_key_t **t = (crypt_key_t **) b;
int r;
- if ((r = safe_strcasecmp (crypt_keyid (*s), crypt_keyid (*t))))
+ if ((r = m_strcasecmp(crypt_keyid (*s), crypt_keyid (*t))))
return r > 0;
else
- return safe_strcasecmp ((*s)->uid, (*t)->uid) > 0;
+ return m_strcasecmp((*s)->uid, (*t)->uid) > 0;
}
static int crypt_compare_keyid (const void *a, const void *b)
if (ts < tt)
return 0;
- return safe_strcasecmp ((*s)->uid, (*t)->uid) > 0;
+ return m_strcasecmp((*s)->uid, (*t)->uid) > 0;
}
static int crypt_compare_date (const void *a, const void *b)
if (ts < tt)
return 0;
- if ((r = safe_strcasecmp ((*s)->uid, (*t)->uid)))
+ if ((r = m_strcasecmp((*s)->uid, (*t)->uid)))
return r > 0;
- return (safe_strcasecmp (crypt_keyid ((*s)), crypt_keyid ((*t)))) > 0;
+ return (m_strcasecmp(crypt_keyid ((*s)), crypt_keyid ((*t)))) > 0;
}
static int crypt_compare_trust (const void *a, const void *b)
int any = 0;
for (; dn->key; dn++) {
- if (!safe_strcmp (dn->key, key)) {
+ if (!m_strcmp(dn->key, key)) {
if (any)
fputs (" + ", fp);
- print_utf8 (fp, dn->value, safe_strlen (dn->value));
+ print_utf8 (fp, dn->value, m_strlen(dn->value));
any = 1;
}
}
/* now print the rest without any specific ordering */
for (; dn->key; dn++) {
for (i = 0; stdpart[i]; i++) {
- if (!safe_strcmp (dn->key, stdpart[i]))
+ if (!m_strcmp(dn->key, stdpart[i]))
break;
}
if (!stdpart[i]) {
n = s - string;
if (!n)
return NULL; /* empty key */
- array->key = safe_malloc (n + 1);
+ array->key = p_dupstr(string, n );
p = (unsigned char *) array->key;
- memcpy (p, string, n); /* fixme: trim trailing spaces */
- p[n] = 0;
string = s + 1;
if (*string == '#') { /* hexstring */
if (!n || (n & 1))
return NULL; /* empty or odd number of digits */
n /= 2;
- p = safe_malloc (n + 1);
+ p = xmalloc(n + 1);
array->value = (char *) p;
for (s1 = string; n; s1 += 2, n--)
*p++ = xtoi_2 (s1);
n++;
}
- p = safe_malloc (n + 1);
+ p = xmalloc(n + 1);
array->value = (char *) p;
for (s = string; n; s++, n--) {
if (*s == '\\') {
int i;
arraysize = 7; /* C,ST,L,O,OU,CN,email */
- array = safe_malloc ((arraysize + 1) * sizeof *array);
+ array = p_new(struct dn_array_s, arraysize + 1);
arrayidx = 0;
while (*string) {
while (*string == ' ')
struct dn_array_s *a2;
arraysize += 5;
- a2 = safe_malloc ((arraysize + 1) * sizeof *array);
+ a2 = p_new(struct dn_array_s, arraysize + 1);
for (i = 0; i < arrayidx; i++) {
a2[i].key = array[i].key;
a2[i].value = array[i].value;
}
- FREE (&array);
+ p_delete(&array);
array = a2;
}
array[arrayidx].key = NULL;
failure:
for (i = 0; i < arrayidx; i++) {
- FREE (&array[i].key);
- FREE (&array[i].value);
+ p_delete(&array[i].key);
+ p_delete(&array[i].value);
}
- FREE (&array);
+ p_delete(&array);
return NULL;
}
else {
print_dn_parts (fp, dn);
for (i = 0; dn[i].key; i++) {
- FREE (&dn[i].key);
- FREE (&dn[i].value);
+ p_delete(&dn[i].key);
+ p_delete(&dn[i].value);
}
- FREE (&dn);
+ p_delete(&dn);
}
}
}
continue;
s = uid->uid;
- fprintf (fp, "%s ......: ", idx ? _(" aka") : _("Name"));
+ fputs (idx ? _(" aka ......: ") :_("Name ......: "), fp);
+
if (uid->invalid) {
fputs (_("[Invalid]"), fp);
putc (' ', fp);
}
if (is_pgp)
- print_utf8 (fp, s, safe_strlen (s));
+ print_utf8 (fp, s, m_strlen(s));
else
parse_and_print_user_id (fp, s);
putc ('\n', fp);
#else
strftime (shortbuf, sizeof shortbuf, "%c", tm);
#endif
- fprintf (fp, "Valid From : %s\n", shortbuf);
+ fprintf (fp, _("Valid From : %s\n"), shortbuf);
}
if (key->subkeys && (key->subkeys->expires > 0)) {
#else
strftime (shortbuf, sizeof shortbuf, "%c", tm);
#endif
- fprintf (fp, "Valid To ..: %s\n", shortbuf);
+ fprintf (fp, _("Valid To ..: %s\n"), shortbuf);
}
if (key->subkeys)
if (key->subkeys)
aval = key->subkeys->length;
- fprintf (fp, "Key Type ..: %s, %lu bit %s\n", s2, aval, s);
+ fprintf (fp, _("Key Type ..: %s, %lu bit %s\n"), s2, aval, s);
- fprintf (fp, "Key Usage .: ");
+ fprintf (fp, _("Key Usage .: "));
delim = "";
if (key_check_cap (key, KEY_CAP_CAN_ENCRYPT)) {
fprintf (fp, "%s%s", delim, _("encryption"));
- delim = ", ";
+ delim = _(", ");
}
if (key_check_cap (key, KEY_CAP_CAN_SIGN)) {
fprintf (fp, "%s%s", delim, _("signing"));
- delim = ", ";
+ delim = _(", ");
}
if (key_check_cap (key, KEY_CAP_CAN_CERTIFY)) {
fprintf (fp, "%s%s", delim, _("certification"));
- delim = ", ";
+ delim = _(", ");
}
putc ('\n', fp);
if (key->subkeys) {
s = key->subkeys->fpr;
fputs (_("Fingerprint: "), fp);
- if (is_pgp && safe_strlen (s) == 40) {
+ if (is_pgp && m_strlen(s) == 40) {
for (i = 0; *s && s[1] && s[2] && s[3] && s[4]; s += 4, i++) {
putc (*s, fp);
putc (s[1], fp);
if (key->issuer_serial) {
s = key->issuer_serial;
if (s)
- fprintf (fp, "Serial-No .: 0x%s\n", s);
+ fprintf (fp, _("Serial-No .: 0x%s\n"), s);
}
if (key->issuer_name) {
s = key->issuer_name;
if (s) {
- fprintf (fp, "Issued By .: ");
+ fprintf (fp, _("Issued By .: "));
parse_and_print_user_id (fp, s);
putc ('\n', fp);
}
s = subkey->keyid;
putc ('\n', fp);
- if (safe_strlen (s) == 16)
+ if (m_strlen(s) == 16)
s += 8; /* display only the short keyID */
- fprintf (fp, "Subkey ....: 0x%s", s);
+ fprintf (fp, _("Subkey ....: 0x%s"), s);
if (subkey->revoked) {
putc (' ', fp);
fputs (_("[Revoked]"), fp);
#else
strftime (shortbuf, sizeof shortbuf, "%c", tm);
#endif
- fprintf (fp, "Valid From : %s\n", shortbuf);
+ fprintf (fp, _("Valid From : %s\n"), shortbuf);
}
if (subkey->expires > 0) {
#else
strftime (shortbuf, sizeof shortbuf, "%c", tm);
#endif
- fprintf (fp, "Valid To ..: %s\n", shortbuf);
+ fprintf (fp, _("Valid To ..: %s\n"), shortbuf);
}
if (subkey)
else
aval = 0;
- fprintf (fp, "Key Type ..: %s, %lu bit %s\n", "PGP", aval, s);
+ fprintf (fp, _("Key Type ..: %s, %lu bit %s\n"), "PGP", aval, s);
- fprintf (fp, "Key Usage .: ");
+ fprintf (fp, _("Key Usage .: "));
delim = "";
if (subkey->can_encrypt) {
fprintf (fp, "%s%s", delim, _("encryption"));
- delim = ", ";
+ delim = _(", ");
}
if (subkey->can_sign) {
fprintf (fp, "%s%s", delim, _("signing"));
- delim = ", ";
+ delim = _(", ");
}
if (subkey->can_certify) {
fprintf (fp, "%s%s", delim, _("certification"));
- delim = ", ";
+ delim = _(", ");
}
putc ('\n', fp);
}
mutt_mktemp (tempfile);
if (!(fp = safe_fopen (tempfile, "w"))) {
- mutt_perror _("Can't create temporary file");
+ mutt_perror (_("Can't create temporary file"));
return;
}
k = key->kobj;
gpgme_key_ref (k);
- while ((s = k->chain_id) && k->subkeys && safe_strcmp (s, k->subkeys->fpr)) {
+ while ((s = k->chain_id) && k->subkeys && m_strcmp(s, k->subkeys->fpr)) {
putc ('\n', fp);
err = gpgme_op_keylist_start (listctx, s, 0);
gpgme_key_release (k);
n++; /* delimiter or end of string */
}
n++; /* make sure to allocate at least one byte */
- pattern = p = safe_calloc (1, n);
+ pattern = p = p_new(char, n);
for (l = list; l; l = l->next) {
s = l->data;
if (*s) {
err = gpgme_new (&ctx);
if (err) {
- mutt_error ("gpgme_new failed: %s", gpgme_strerror (err));
- FREE (&pattern);
+ mutt_error (_("gpgme_new failed: %s"), gpgme_strerror (err));
+ p_delete(&pattern);
return NULL;
}
if (!n)
goto no_pgphints;
- patarr = safe_calloc (n + 1, sizeof *patarr);
+ patarr = p_new(char *, n + 1);
for (l = hints, n = 0; l; l = l->next) {
if (l->data && *l->data)
- patarr[n++] = safe_strdup (l->data);
+ patarr[n++] = m_strdup(l->data);
}
patarr[n] = NULL;
err = gpgme_op_keylist_ext_start (ctx, (const char **) patarr, secret, 0);
for (n = 0; patarr[n]; n++)
- FREE (&patarr[n]);
- FREE (&patarr);
+ p_delete(&patarr[n]);
+ p_delete(&patarr);
if (err) {
- mutt_error ("gpgme_op_keylist_start failed: %s", gpgme_strerror (err));
+ mutt_error (_("gpgme_op_keylist_start failed: %s"), gpgme_strerror (err));
gpgme_release (ctx);
- FREE (&pattern);
+ p_delete(&pattern);
return NULL;
}
#endif /* DISABLED code */
for (idx = 0, uid = key->uids; uid; idx++, uid = uid->next) {
- k = safe_calloc (1, sizeof *k);
+ k = p_new(crypt_key_t, 1);
k->kobj = key;
k->idx = idx;
k->uid = uid->uid;
}
}
if (gpg_err_code (err) != GPG_ERR_EOF)
- mutt_error ("gpgme_op_keylist_next failed: %s", gpgme_strerror (err));
+ mutt_error (_("gpgme_op_keylist_next failed: %s"), gpgme_strerror (err));
gpgme_op_keylist_end (ctx);
no_pgphints:
;
gpgme_set_protocol (ctx, GPGME_PROTOCOL_CMS);
err = gpgme_op_keylist_start (ctx, pattern, 0);
if (err) {
- mutt_error ("gpgme_op_keylist_start failed: %s", gpgme_strerror (err));
+ mutt_error (_("gpgme_op_keylist_start failed: %s"), gpgme_strerror (err));
gpgme_release (ctx);
- FREE (&pattern);
+ p_delete(&pattern);
return NULL;
}
flags |= KEYFLAG_CANSIGN;
for (idx = 0, uid = key->uids; uid; idx++, uid = uid->next) {
- k = safe_calloc (1, sizeof *k);
+ k = p_new(crypt_key_t, 1);
k->kobj = key;
k->idx = idx;
k->uid = uid->uid;
}
}
if (gpg_err_code (err) != GPG_ERR_EOF)
- mutt_error ("gpgme_op_keylist_next failed: %s", gpgme_strerror (err));
+ mutt_error (_("gpgme_op_keylist_next failed: %s"), gpgme_strerror (err));
gpgme_op_keylist_end (ctx);
}
gpgme_release (ctx);
- FREE (&pattern);
+ p_delete(&pattern);
return db;
}
char *scratch;
char *t;
- if ((scratch = safe_strdup (str)) == NULL)
+ if ((scratch = m_strdup(str)) == NULL)
return hints;
for (t = strtok (scratch, " ,.:\"()<>\n"); t;
t = strtok (NULL, " ,.:\"()<>\n")) {
- if (safe_strlen (t) > 3)
- hints = mutt_add_list (hints, t);
+ if (m_strlen(t) > 3)
+ hints = mutt_add_list(hints, t);
}
- FREE (&scratch);
+ p_delete(&scratch);
return hints;
}
will be set to true on return if the user did override the the
key's validity. */
static crypt_key_t *crypt_select_key (crypt_key_t * keys,
- ADDRESS * p, const char *s,
+ address_t * p, const char *s,
unsigned int app, int *forced_valid)
{
int keymax;
if (i == keymax) {
keymax += 20;
- safe_realloc (&key_table, sizeof (crypt_key_t *) * keymax);
+ p_realloc(&key_table, keymax);
}
key_table[i++] = k;
}
mutt_menuDestroy (&menu);
- FREE (&key_table);
+ p_delete(&key_table);
set_option (OPTNEEDREDRAW);
return k;
}
-static crypt_key_t *crypt_getkeybyaddr (ADDRESS * a, short abilities,
+static crypt_key_t *crypt_getkeybyaddr (address_t * a, short abilities,
unsigned int app, int *forced_valid)
{
- ADDRESS *r, *p;
+ address_t *r, *p;
LIST *hints = NULL;
int weak = 0;
if (!keys)
return NULL;
- dprint (5, (debugfile, "crypt_getkeybyaddr: looking for %s <%s>.",
- a->personal, a->mailbox));
+ debug_print (5, ("looking for %s <%s>.\n", a->personal, a->mailbox));
for (k = keys; k; k = k->next) {
- dprint (5, (debugfile, " looking at key: %s `%.15s'\n",
- crypt_keyid (k), k->uid));
+ debug_print (5, (" looking at key: %s `%.15s'\n", crypt_keyid (k), k->uid));
if (abilities && !(k->flags & abilities)) {
- dprint (5, (debugfile, " insufficient abilities: Has %x, want %x\n",
- k->flags, abilities));
+ debug_print (5, (" insufficient abilities: Has %x, want %x\n", k->flags, abilities));
continue;
}
|| !(validity & CRYPT_KV_ADDR)))
this_key_has_weak = 1;
}
- rfc822_free_address (&r);
+ address_delete (&r);
if (match) {
crypt_key_t *tmp;
continue;
match = 0;
- dprint (5, (debugfile, "crypt_getkeybystr: matching \"%s\" against "
- "key %s, \"%s\": ", p, crypt_keyid (k), k->uid));
+ debug_print (5, ("matching \"%s\" against " "key %s, \"%s\":\n", p, crypt_keyid (k), k->uid));
- if (!*p || !safe_strcasecmp (p, crypt_keyid (k))
- || (!safe_strncasecmp (p, "0x", 2)
- && !safe_strcasecmp (p + 2, crypt_keyid (k)))
+ if (!*p || !m_strcasecmp(p, crypt_keyid (k))
+ || (!m_strncasecmp(p, "0x", 2)
+ && !m_strcasecmp(p + 2, crypt_keyid (k)))
|| (option (OPTPGPLONGIDS)
- && !safe_strncasecmp (p, "0x", 2)
- && !safe_strcasecmp (p + 2, crypt_keyid (k) + 8))
- || str_isstr (k->uid, p)) {
+ && !m_strncasecmp(p, "0x", 2)
+ && !m_strcasecmp(p + 2, crypt_keyid (k) + 8))
+ || m_stristr(k->uid, p)) {
crypt_key_t *tmp;
- dprint (5, (debugfile, "match.\n"));
+ debug_print (5, ("match.\n"));
*matches_endp = tmp = crypt_copy_key (k);
matches_endp = &tmp->next;
if (whatfor) {
for (l = id_defaults; l; l = l->next)
- if (!safe_strcasecmp (whatfor, l->what)) {
- strfcpy (resp, NONULL (l->dflt), sizeof (resp));
+ if (!m_strcasecmp(whatfor, l->what)) {
+ m_strcpy(resp, sizeof(resp), NONULL(l->dflt));
break;
}
}
if (whatfor) {
if (l)
- str_replace (&l->dflt, resp);
+ m_strreplace(&l->dflt, resp);
else {
- l = safe_malloc (sizeof (struct crypt_cache));
+ l = p_new(struct crypt_cache, 1);
l->next = id_defaults;
id_defaults = l;
- l->what = safe_strdup (whatfor);
- l->dflt = safe_strdup (resp);
+ l->what = m_strdup(whatfor);
+ l->dflt = m_strdup(resp);
}
}
/* 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. */
-static char *find_keys (ADDRESS * to, ADDRESS * cc, ADDRESS * bcc,
+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;
- 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;
crypt_key_t *k_info, *key;
const char *fqdn = mutt_fqdn (1);
abort ();
}
- *last = rfc822_cpy_adr (p);
+ *last = address_list_dup (p);
while (*last)
last = &((*last)->next);
}
}
}
else if (r == -1) {
- FREE (&keylist);
- rfc822_free_address (&tmp);
- rfc822_free_address (&addr);
+ p_delete(&keylist);
+ address_delete (&tmp);
+ address_delete (&addr);
return NULL;
}
}
app,
#endif
&forced_valid)) == NULL) {
- FREE (&keylist);
- rfc822_free_address (&tmp);
- rfc822_free_address (&addr);
+ p_delete(&keylist);
+ address_delete (&tmp);
+ address_delete (&addr);
return NULL;
}
}
*r_application &= ~APPLICATION_SMIME;
#endif
- keylist_size += safe_strlen (s) + 4 + 1;
- safe_realloc (&keylist, keylist_size);
+ keylist_size += m_strlen(s) + 4 + 1;
+ p_realloc(&keylist, keylist_size);
sprintf (keylist + keylist_used, "%s0x%s%s", /* __SPRINTF_CHECKED__ */
keylist_used ? " " : "", s, forced_valid ? "!" : "");
}
- keylist_used = safe_strlen (keylist);
+ keylist_used = m_strlen(keylist);
crypt_free_key (&key);
- rfc822_free_address (&addr);
+ address_delete (&addr);
}
- rfc822_free_address (&tmp);
+ address_delete (&tmp);
return (keylist);
}
-char *pgp_gpgme_findkeys (ADDRESS * to, ADDRESS * cc, ADDRESS * bcc)
+char *pgp_gpgme_findkeys (address_t * to, address_t * cc, address_t * bcc)
{
return find_keys (to, cc, bcc, APPLICATION_PGP);
}
-char *smime_gpgme_findkeys (ADDRESS * to, ADDRESS * cc, ADDRESS * bcc)
+char *smime_gpgme_findkeys (address_t * to, address_t * cc, address_t * bcc)
{
return find_keys (to, cc, bcc, APPLICATION_SMIME);
}
if (is_smime)
choice =
mutt_multi_choice (_
- ("S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (t)oggle or (f)orget it?"),
- _("esabtf"));
+ ("S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"),
+ _("esabpfc"));
else
choice =
mutt_multi_choice (_
- ("PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (t)oggle or (f)orget it?"),
- _("esabtf"));
+ ("PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"),
+ _("esabmfc"));
switch (choice) {
case 1: /* (e)ncrypt */
msg->security |= (is_smime ? SMIMEENCRYPT : PGPENCRYPT);
+ msg->security &= ~(is_smime ? SMIMESIGN : PGPSIGN);
break;
case 2: /* (s)ign */
msg->security |= (is_smime ? SMIMESIGN : PGPSIGN);
+ msg->security &= ~(is_smime ? SMIMEENCRYPT : PGPENCRYPT);
break;
case 3: /* sign (a)s */
is_smime ? APPLICATION_SMIME :
APPLICATION_PGP, NULL))) {
snprintf (input_signas, sizeof (input_signas), "0x%s", crypt_keyid (p));
- str_replace (is_smime ? &SmimeDefaultKey : &PgpSignAs,
+ m_strreplace(is_smime ? &SmimeDefaultKey : &PgpSignAs,
input_signas);
crypt_free_key (&p);
msg->security |= (is_smime ? SMIMESIGN : PGPSIGN);
}
+#if 0
else {
msg->security &= (is_smime ? ~SMIMESIGN : ~PGPSIGN);
}
+#endif
*redraw = REDRAW_FULL;
break;
(is_smime ? (SMIMEENCRYPT | SMIMESIGN) : (PGPENCRYPT | PGPSIGN));
break;
- case 5: /* (t)oggle */
+ case 5: /* (p)gp or s/(m)ime */
is_smime = !is_smime;
break;
- case 6: /* (f)orget it */
+ case 6: /* (c)lear */
msg->security = 0;
break;
}
- if (choice == 6);
+ if (choice == 6 || choice == 7);
else if (is_smime) {
msg->security &= ~APPLICATION_PGP;
msg->security |= APPLICATION_SMIME;
static int verify_sender (HEADER * h, gpgme_protocol_t protocol)
{
- ADDRESS *sender = NULL;
+ address_t *sender = NULL;
unsigned int ret = 1;
if (h->env->from) {
int sender_length = 0;
int uid_length = 0;
- sender_length = safe_strlen (sender->mailbox);
+ sender_length = m_strlen(sender->mailbox);
for (uid = key->uids; uid && ret; uid = uid->next) {
- uid_length = safe_strlen (uid->email);
+ uid_length = m_strlen(uid->email);
if (1 && (uid->email[0] == '<')
&& (uid->email[uid_length - 1] == '>')
&& (uid_length == sender_length + 2)
projects / apps / madmutt.git / blobdiff