From 8246a2c9d4121718d94ba115e6d3e3bbaf201dd9 Mon Sep 17 00:00:00 2001 From: Kevin McCarthy Date: Sat, 27 Jul 2019 15:34:51 -0700 Subject: [PATCH] Add account->enabled checks Add to ui recommendation, keylist generator, and autocrypt header writing routines. Co-authored-by: Richard Russon --- autocrypt/autocrypt.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/autocrypt/autocrypt.c b/autocrypt/autocrypt.c index 5ccbf1130..3bebe9274 100644 --- a/autocrypt/autocrypt.c +++ b/autocrypt/autocrypt.c @@ -510,6 +510,9 @@ enum AutocryptRec mutt_autocrypt_ui_recommendation(struct Email *hdr, char **key if (mutt_autocrypt_db_account_get(from, &account) <= 0) goto cleanup; + if (!account->enabled) + goto cleanup; + keylist_buf = mutt_buffer_pool_get(); mutt_buffer_addstr(keylist_buf, account->keyid); @@ -606,6 +609,8 @@ int mutt_autocrypt_set_sign_as_default_key(struct Email *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); @@ -657,6 +662,8 @@ int mutt_autocrypt_write_autocrypt_header(struct 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, -- 2.40.0