# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
+
#include "mutt.h"
#include "enter.h"
-#include "ascii.h"
#include "handler.h"
#include "mutt_curses.h"
#include "pgp.h"
#include "copy.h"
#include "attach.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/debug.h"
#include <sys/wait.h>
void pgp_void_passphrase (void)
{
- memset (PgpPass, 0, sizeof (PgpPass));
+ p_clear(PgpPass, sizeof(PgpPass));
PgpExptime = 0;
}
fputs (line, fpout);
fputc ('\n', fpout);
}
- mem_free (&line);
+ p_delete(&line);
}
else {
debug_print (2, ("No pattern.\n"));
continue;
}
- if (str_cmp (buf, "-----BEGIN PGP SIGNATURE-----\n") == 0)
+ if (m_strcmp(buf, "-----BEGIN PGP SIGNATURE-----\n") == 0)
break;
if (armor_header) {
break;
offset = ftello (s->fpin);
- bytes -= (offset - last_pos); /* don't rely on str_len(buf) */
+ 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;
- if (str_cmp ("MESSAGE-----\n", buf + 15) == 0)
+ if (m_strcmp("MESSAGE-----\n", buf + 15) == 0)
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) &&
- str_cmp ("PUBLIC KEY BLOCK-----\n", buf + 15) == 0) {
+ m_strcmp("PUBLIC KEY BLOCK-----\n", buf + 15) == 0) {
needpass = 0;
pgp_keyblock = 1;
}
fputs (buf, tmpfp);
while (bytes > 0 && fgets (buf, sizeof (buf) - 1, s->fpin) != NULL) {
offset = ftello (s->fpin);
- bytes -= (offset - last_pos); /* don't rely on str_len(buf) */
+ bytes -= (offset - last_pos); /* don't rely on m_strlen(buf) */
last_pos = offset;
fputs (buf, tmpfp);
if ((needpass
- && str_cmp ("-----END PGP MESSAGE-----\n", buf) == 0)
+ && m_strcmp("-----END PGP MESSAGE-----\n", buf) == 0)
|| (!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;
}
}
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;
- else if (str_cmp ("SIGNED MESSAGE-----\n", buf + 15) == 0)
+ else if (m_strcmp("SIGNED MESSAGE-----\n", buf + 15) == 0)
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;
}
}
return;
}
- memset (&s, 0, sizeof (STATE));
+ p_clear(&s, 1);
s.fpin = fp;
s.fpout = tempfp;
* read_mime_header has a hard time parsing the message.
*/
while (fgets (buf, sizeof (buf) - 1, pgpout) != NULL) {
- len = str_len (buf);
+ len = m_strlen(buf);
if (len > 1 && buf[len - 2] == '\r')
strcpy (buf + len - 2, "\n"); /* __STRCPY_CHECKED__ */
fputs (buf, fpout);
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) {
* 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);
- 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);
t = mutt_new_body ();
t->type = TYPEMULTIPART;
- t->subtype = str_dup ("signed");
+ t->subtype = m_strdup("signed");
t->encoding = ENC7BIT;
t->use_disp = 0;
t->disposition = DISPINLINE;
t->parts->next = mutt_new_body ();
t = t->parts->next;
t->type = TYPEAPPLICATION;
- t->subtype = str_dup ("pgp-signature");
- t->filename = str_dup (sigfile);
+ t->subtype = m_strdup("pgp-signature");
+ t->filename = m_strdup(sigfile);
t->use_disp = 0;
t->disposition = DISPINLINE;
t->encoding = ENC7BIT;
/* or should we require the "0x"? */
if (strncmp (s, "0x", 2) == 0)
s += 2;
- if (str_len (s) % 8)
+ if (m_strlen(s) % 8)
return 0;
while (*s)
if (strchr ("0123456789ABCDEFabcdef", *s++) == NULL)
k_info = pgp_getkeybystr (keyID, KEYFLAG_CANENCRYPT, PGP_PUBRING);
}
else if (r == -1) {
- mem_free (&keylist);
+ p_delete(&keylist);
rfc822_free_address (&tmp);
rfc822_free_address (&addr);
return NULL;
if ((key = pgp_ask_for_key (buf, q->mailbox,
KEYFLAG_CANENCRYPT, PGP_PUBRING)) == NULL) {
- mem_free (&keylist);
+ p_delete(&keylist);
rfc822_free_address (&tmp);
rfc822_free_address (&addr);
return NULL;
keyID = pgp_keyid (key);
bypass_selection:
- keylist_size += str_len (keyID) + 4;
- mem_realloc (&keylist, keylist_size);
+ keylist_size += m_strlen(keyID) + 4;
+ p_realloc(&keylist, keylist_size);
sprintf (keylist + keylist_used, "%s0x%s", keylist_used ? " " : "", /* __SPRINTF_CHECKED__ */
keyID);
- keylist_used = str_len (keylist);
+ keylist_used = m_strlen(keylist);
pgp_free_key (&key);
rfc822_free_address (&addr);
t = mutt_new_body ();
t->type = TYPEMULTIPART;
- t->subtype = str_dup ("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 = str_dup ("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 = str_dup ("octet-stream");
+ t->parts->next->subtype = m_strdup("octet-stream");
t->parts->next->encoding = ENC7BIT;
- t->parts->next->filename = str_dup (tempfile);
+ t->parts->next->filename = m_strdup(tempfile);
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 = str_dup ("msg.asc"); /* non pgp/mime can save */
+ t->parts->next->d_filename = m_strdup("msg.asc"); /* non pgp/mime can save */
return (t);
}
b->encoding = ENC7BIT;
b->type = TYPETEXT;
- b->subtype = str_dup ("plain");
+ 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);
- b->filename = str_dup (pgpoutfile);
+ 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 = str_dup ("msg.pgp");
+ b->d_filename = m_strdup("msg.pgp");
b->use_disp = 1;
#endif