#include <lib-mime/mime.h>
+#include <lib-ui/curses.h>
+#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
+#include <lib-lib/debug.h>
+
#include "mutt.h"
-#include "enter.h"
#include "handler.h"
-#include "mutt_curses.h"
#include "pgp.h"
#include "copy.h"
#include "attach.h"
-#include "lib/debug.h"
#include <sys/wait.h>
#include <string.h>
#endif
#include "crypt.h"
-#include "mutt_menu.h"
char PgpPass[LONG_STRING];
void pgp_void_passphrase (void)
{
- p_clear(PgpPass, sizeof(PgpPass));
+ p_clear(PgpPass, countof(PgpPass));
PgpExptime = 0;
}
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) {
}
else if (pgpout) {
FGETCONV *fc;
- int c;
rewind (pgpout);
state_set_prefix (s);
}
else if (r == -1) {
p_delete(&keylist);
- address_delete (&tmp);
- address_delete (&addr);
+ address_list_wipe(&tmp);
+ address_list_wipe(&addr);
return NULL;
}
}
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;
}
}
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);
}