Add account->enabled checks.

Add to ui recommendation, keylist generator, and autocrypt header
writing routines.

diff --git a/autocrypt/autocrypt.c b/autocrypt/autocrypt.c
index 1b0dd2af77195ad9dd3d3f8d6c159d24e36de8c5..73584650ce902f64b63537c1f4d46cda7b0bb629 100644 (file)
--- a/autocrypt/autocrypt.c
+++ b/autocrypt/autocrypt.c
@@ -499,6 +499,9 @@ autocrypt_rec_t mutt_autocrypt_ui_recommendation (HEADER *hdr, char **keylist)
   if (mutt_autocrypt_db_account_get (hdr->env->from, &account) <= 0)
     goto cleanup;
 
+  if (!account->enabled)
+    goto cleanup;
+
   keylist_buf = mutt_buffer_pool_get ();
   mutt_buffer_addstr (keylist_buf, account->keyid);
 
@@ -593,6 +596,8 @@ int mutt_autocrypt_set_sign_as_default_key (HEADER *hdr)
     goto cleanup;
   if (!account->keyid)
     goto cleanup;
+  if (!account->enabled)
+    goto cleanup;
 
   mutt_str_replace (&AutocryptSignAs, account->keyid);
   mutt_str_replace (&AutocryptDefaultKey, account->keyid);
@@ -646,6 +651,8 @@ int mutt_autocrypt_write_autocrypt_header (ENVELOPE *env, FILE *fp)
     goto cleanup;
   if (!account->keydata)
     goto cleanup;
+  if (!account->enabled)
+    goto cleanup;
 
   fputs ("Autocrypt: ", fp);
   write_autocrypt_header_line (fp, account->email_addr, account->prefer_encrypt,