#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include <lib-lib/file.h>
+#include <lib-lib/debug.h>
#include <lib-mime/mime.h>
+#include <lib-ui/curses.h>
+#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
+
#include "mutt.h"
-#include "enter.h"
#include "handler.h"
-#include "mutt_curses.h"
-#include "mutt_menu.h"
#include "copy.h"
-#include "lib/debug.h"
#include <sys/wait.h>
#include <string.h>
void smime_void_passphrase (void)
{
- p_clear(SmimePass, sizeof(SmimePass));
+ p_clear(SmimePass, countof(SmimePass));
SmimeExptime = 0;
}
}
if (!found && (t = mutt_default_from ())) {
_smime_getkeys (t->mailbox);
- address_delete (&t);
+ address_list_wipe(&t);
}
}
if (!keyID) {
mutt_message (_("No (valid) certificate found for %s."), q->mailbox);
p_delete(&keylist);
- address_delete (&tmp);
- address_delete (&addr);
+ address_list_wipe(&tmp);
+ address_list_wipe(&addr);
return NULL;
}
sprintf (keylist + keylist_used, "%s\n", keyID); /* __SPRINTF_CHECKED__ */
keylist_used = m_strlen(keylist);
- address_delete (&addr);
+ address_list_wipe(&addr);
}
- address_delete (&tmp);
+ address_list_wipe(&tmp);
return (keylist);
}