always build mutt with pgp + smime support.

[apps/madmutt.git] / postpone.c

diff --git a/postpone.c b/postpone.c
index 7cfe924..afcc9b1 100644 (file)
--- a/postpone.c
+++ b/postpone.c
@@ -332,10 +332,9 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
       mutt_free_list (&tmp);
       tmp = next;
     }
-    else if ((WithCrypto & APPLICATION_PGP)
-             && (m_strncmp("Pgp:", tmp->data, 4) == 0       /* this is generated
-                                                                 * by old mutt versions
-                                                                 */
+    else if ((m_strncmp("Pgp:", tmp->data, 4) == 0       /* this is generated
+                                                          * by old mutt versions
+                                                          */
                  || m_strncmp("X-Mutt-PGP:", tmp->data, 11) == 0)) {
       hdr->security = mutt_parse_crypt_hdr (strchr (tmp->data, ':') + 1, 1);
       hdr->security |= APPLICATION_PGP;
@@ -350,8 +349,7 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
       mutt_free_list (&tmp);
       tmp = next;
     }
-    else if ((WithCrypto & APPLICATION_SMIME)
-             && m_strncmp("X-Mutt-SMIME:", tmp->data, 13) == 0) {
+    else if (m_strncmp("X-Mutt-SMIME:", tmp->data, 13) == 0) {
       hdr->security = mutt_parse_crypt_hdr (strchr (tmp->data, ':') + 1, 1);
       hdr->security |= APPLICATION_SMIME;
 
@@ -405,11 +403,7 @@ int mutt_parse_crypt_hdr (char *p, int set_signas)
   char pgp_sign_as[LONG_STRING] = "\0", *q;
   char smime_cryptalg[LONG_STRING] = "\0";
 
-  if (!WithCrypto)
-    return 0;
-
   for (p = vskipspaces(p); *p; p++) {
-
     switch (*p) {
     case 'e':
     case 'E':
@@ -488,10 +482,10 @@ int mutt_parse_crypt_hdr (char *p, int set_signas)
   }
 
   /* the cryptalg field must not be empty */
-  if ((WithCrypto & APPLICATION_SMIME) && *smime_cryptalg)
+  if (*smime_cryptalg)
     m_strreplace(&SmimeCryptAlg, smime_cryptalg);
 
-  if ((WithCrypto & APPLICATION_PGP) && (set_signas || *pgp_sign_as))
+  if (set_signas || *pgp_sign_as)
     m_strreplace(&PgpSignAs, pgp_sign_as);
 
   return pgp;
@@ -533,10 +527,10 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
 
   /* decrypt pgp/mime encoded messages */
 
-  if ((WithCrypto & (APPLICATION_PGP | APPLICATION_SMIME) & hdr->security)
-      && mutt_is_multipart_encrypted (newhdr->content)) {
-    int ccap =
-      WithCrypto & (APPLICATION_PGP | APPLICATION_SMIME) & hdr->security;
+  if ((APPLICATION_PGP | APPLICATION_SMIME) & hdr->security
+      && mutt_is_multipart_encrypted (newhdr->content))
+  {
+    int ccap = (APPLICATION_PGP | APPLICATION_SMIME) & hdr->security;
     newhdr->security |= ENCRYPT | ccap;
     if (!crypt_valid_passphrase (ccap))
       goto err;
@@ -568,15 +562,13 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
    * resending messages 
    */
 
-  if (WithCrypto && mutt_is_multipart_signed (newhdr->content)) {
+  if (mutt_is_multipart_signed (newhdr->content)) {
     newhdr->security |= SIGN;
-    if ((WithCrypto & APPLICATION_PGP)
-        &&
-        ascii_strcasecmp (mutt_get_parameter
+    if (ascii_strcasecmp (mutt_get_parameter
                           ("protocol", newhdr->content->parameter),
                           "application/pgp-signature") == 0)
       newhdr->security |= APPLICATION_PGP;
-    else if ((WithCrypto & APPLICATION_SMIME))
+    else
       newhdr->security |= APPLICATION_SMIME;
 
     /* destroy the signature */
@@ -638,8 +630,7 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
       goto bail;
 
 
-    if ((WithCrypto & APPLICATION_PGP)
-        && (mutt_is_application_pgp (b) & (ENCRYPT | SIGN))) {
+    if (mutt_is_application_pgp (b) & (ENCRYPT | SIGN)) {
 
       mutt_body_handler (b, &s);
 
@@ -668,12 +659,9 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
   /* Fix encryption flags. */
 
   /* No inline if multipart. */
-  if (WithCrypto && (newhdr->security & INLINE) && newhdr->content->next)
+  if ((newhdr->security & INLINE) && newhdr->content->next)
     newhdr->security &= ~INLINE;
 
-  /* Do we even support multiple mechanisms? */
-  newhdr->security &= WithCrypto | ~(APPLICATION_PGP | APPLICATION_SMIME);
-
   /* Theoretically, both could be set. Take the one the user wants to set by default. */
   if ((newhdr->security & APPLICATION_PGP)
       && (newhdr->security & APPLICATION_SMIME)) {