#include "handler.h"
#include "sort.h"
#include "thread.h"
-#include <lib-crypt/crypt.h>
+#include "crypt.h"
#include <imap/imap.h>
&& crypt_pgp_decrypt_mime (fp, &bfp, newhdr->content, &b) == -1)
|| ((ccap & APPLICATION_SMIME)
&& crypt_smime_decrypt_mime (fp, &bfp, newhdr->content, &b) == -1)
- || b == NULL) {
- err:
+ || b == NULL)
+ {
mx_close_message (&msg);
envelope_delete(&newhdr->env);
body_list_wipe(&newhdr->content);
/* Theoretically, both could be set. Take the one the user wants to set by default. */
if ((newhdr->security & APPLICATION_PGP)
&& (newhdr->security & APPLICATION_SMIME)) {
- if (option (OPTSMIMEISDEFAULT))
+ if (mod_crypt.smime_is_default)
newhdr->security &= ~APPLICATION_PGP;
else
newhdr->security &= ~APPLICATION_SMIME;