summaryrefslogtreecommitdiffstats
path: root/mutt_crypt.h
diff options
context:
space:
mode:
authorKevin McCarthy <kevin@8t8.us>2019-07-21 15:15:06 -0700
committerKevin McCarthy <kevin@8t8.us>2019-08-03 14:08:09 -0700
commit963fc1ba4795ec65083741adf7b649d997fd58b7 (patch)
tree3d4d2365fc48a3231e4ecfa8633fff2142c4ceb7 /mutt_crypt.h
parent959628d079b6efaa9c724f9be83af3d6061fdae4 (diff)
Autocrypt outgoing emails.
Change crypt_get_keys() to query autocrypt. When oppenc_mode is set, we still query the original keyring regardless, because the compose menu can still run oppenc even if autocrypt is on. Since mutt_autocrypt_ui_recommendation() checks each key as part of making the recommendation, add a keylist parameter and use that function. Add gpgme changes to use the autocrypt context for encryption. Postpone work: * Change mutt_protect() to have a postpone parameter. Remove the manual toggling of the SIGN bit outside the call when postponing. * Since autocrypt doesn't set the SIGN bit, this allows us to turn off signing inside mutt_protect() for both normal and autocrypt mode. * Set the autocrypt postpone key in AutocryptDefaultKey. Write autocrypt and gossip headers in outgoing emails.
Diffstat (limited to 'mutt_crypt.h')
-rw-r--r--mutt_crypt.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/mutt_crypt.h b/mutt_crypt.h
index 79182297..28f70ee9 100644
--- a/mutt_crypt.h
+++ b/mutt_crypt.h
@@ -111,7 +111,7 @@ typedef struct pgp_keyinfo *pgp_key_t;
/* Some prototypes -- old crypt.h. */
-int mutt_protect (HEADER *, char *);
+int mutt_protect (HEADER *, char *, int);
int mutt_is_multipart_encrypted (BODY *);
@@ -244,7 +244,7 @@ BODY *crypt_pgp_sign_message (BODY *a);
/* Warning: A is no longer freed in this routine, you need to free it
later. This is necessary for $fcc_attach. */
-BODY *crypt_pgp_encrypt_message (BODY *a, char *keylist, int sign);
+BODY *crypt_pgp_encrypt_message (HEADER *msg, BODY *a, char *keylist, int sign);
/* Invoke the PGP command to import a key. */
void crypt_pgp_invoke_import (const char *fname);