From: Richard Russon Date: Thu, 18 Aug 2016 16:08:49 +0000 (+0100) Subject: reformat X-Git-Tag: neomutt-20160822~33^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0265f437bea2b1bac9462372345eecfe7e253e0b;p=neomutt reformat --- diff --git a/crypt.c b/crypt.c index 4d3668003..5aa8266b2 100644 --- a/crypt.c +++ b/crypt.c @@ -231,21 +231,21 @@ int mutt_protect (HEADER *msg, char *keylist) if ((WithCrypto & APPLICATION_SMIME) && (msg->security & APPLICATION_SMIME)) { - char *new_keylist = keylist; - - if (SmimeDefaultKey && query_quadoption(OPT_SMIMEENCRYPTSELF, _("Encrypt message to S/MIME Default Key also?")) == MUTT_YES) - { - /* +1 for NULL, +1 for \n */ - int size = mutt_strlen(keylist) + mutt_strlen(SmimeDefaultKey) + 2; - new_keylist = safe_malloc(size); - snprintf(new_keylist, size, "%s%s\n", keylist, SmimeDefaultKey); - } - - tmp_pbody = crypt_smime_build_smime_entity (tmp_smime_pbody, new_keylist); - if (new_keylist != keylist) - FREE(&new_keylist); - - if (!tmp_pbody) + char *new_keylist = keylist; + + if (SmimeDefaultKey && query_quadoption(OPT_SMIMEENCRYPTSELF, _("Encrypt message to S/MIME Default Key also?")) == MUTT_YES) + { + /* +1 for NULL, +1 for \n */ + int size = mutt_strlen(keylist) + mutt_strlen(SmimeDefaultKey) + 2; + new_keylist = safe_malloc(size); + snprintf(new_keylist, size, "%s%s\n", keylist, SmimeDefaultKey); + } + + tmp_pbody = crypt_smime_build_smime_entity (tmp_smime_pbody, new_keylist); + if (new_keylist != keylist) + FREE(&new_keylist); + + if (!tmp_pbody) { /* signed ? free it! */ return (-1);