#include <lib-mime/mime.h>
#include <lib-ui/lib-ui.h>
-#include <lib-ui/enter.h>
#include <lib-ui/menu.h>
#include <lib-mx/mx.h>
if (err) {
mutt_error(_("error creating gpgme context: %s\n"),
gpgme_strerror(err));
- sleep(2);
+ mutt_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));
- sleep(2);
+ mutt_sleep(2);
mutt_exit(1);
}
return ctx;
if (err) {
mutt_error(_("error creating gpgme data object: %s\n"),
gpgme_strerror(err));
- sleep(2);
+ mutt_sleep(2);
mutt_exit(1);
}
return data;
static char *data_object_to_tempfile(gpgme_data_t data, FILE **ret_fp)
{
int err;
- char tempfile[_POSIX_PATH_MAX];
+ char tempfile[_POSIX_PATH_MAX], buf[BUFSIZ];
FILE *fp;
ssize_t nread = 0;
err = ((gpgme_data_seek (data, 0, SEEK_SET) == -1)
? gpgme_error_from_errno (errno) : 0);
- if (!err) {
- char buf[4096];
+ if (err) {
+ mutt_perror(_("Can't create temporary file"));
+ goto error;
+ }
- while ((nread = gpgme_data_read(data, buf, sizeof(buf)))) {
- if (fwrite (buf, nread, 1, fp) != 1) {
- mutt_perror (_("Can't create temporary file"));
- m_fclose(&fp);
- unlink (tempfile);
- return NULL;
- }
+ while ((nread = gpgme_data_read(data, buf, sizeof(buf)))) {
+ if (fwrite (buf, nread, 1, fp) != 1) {
+ mutt_perror (_("Can't create temporary file"));
+ goto error;
}
}
if (nread == -1) {
mutt_error (_("error reading data object: %s\n"), gpgme_strerror (err));
- unlink (tempfile);
- m_fclose(&fp);
- return NULL;
+ goto error;
}
if (ret_fp) {
rewind(fp);
m_fclose(&fp);
}
return m_strdup(tempfile);
+
+ error:
+ m_fclose(&fp);
+ unlink (tempfile);
+ return NULL;
}
}
}
+static char *crypt_hook(address_t *adr)
+{
+ char *res = NULL;
+ lua_State *L = luaM_getruntime();
+ lua_getglobal(L, "mod_core"); /* push mod_core 1 */
+ lua_getfield(L, -1, "crypt_hook"); /* push folder_hook() 2 */
+ if (lua_isfunction(L, -1)) {
+ lua_pushstring(L, adr->mailbox);
+ if (!lua_pcall(L, 1, 1, 0)) {
+ res = m_strdup(lua_tostring(L, -1));
+ }
+ lua_pop(L, 1);
+ }
+ lua_pop(L, 2);
+ return res;
+}
+
/* 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(ENVELOPE *env, unsigned int app)
while ((addr = address_list_pop(&lst))) {
char buf[STRING];
int forced_valid = 0;
- const char *keyID;
+ char *keyID;
cryptkey_t *key = NULL;
- if ((keyID = mutt_crypt_hook(addr))) {
+ if ((keyID = crypt_hook(addr))) {
int r;
snprintf(buf, sizeof(buf), _("Use keyID = \"%s\" for %s?"), keyID,
address_list_wipe(&lst);
address_list_wipe(&addr);
buffer_delete(&keylist);
+ p_delete(&keyID);
return NULL;
}
}
}
}
+ p_delete(&keyID);
if (!key) {
key = crypt_getkeybyaddr(addr, KEYFLAG_CANENCRYPT, app, &forced_valid);