X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=commands.c;h=58eaaa54395691f7220a8fd0e6085ee74d2d2acb;hp=5ceb9ce35b6487ba3e86807056577abc72fc049d;hb=0ac011f8eb41bab7808881ebf9802b4eb252fe3b;hpb=cfc49a0d8c3ac2c0bd4b217026d0740c55f2e5db

diff --git a/commands.c b/commands.c
index 5ceb9ce..58eaaa5 100644
--- a/commands.c
+++ b/commands.c
@@ -108,7 +108,7 @@ int mutt_display_message (HEADER * cur)
 
   if (res != -1) {
     /* see if crytpo is needed for this message.  if so, we should exit curses */
-    if (WithCrypto && cur->security) {
+    if (cur->security) {
       if (cur->security & ENCRYPT) {
         if (cur->security & APPLICATION_SMIME)
           crypt_smime_getkeys (cur->env);
@@ -173,21 +173,18 @@ int mutt_display_message (HEADER * cur)
   safe_fclose (&fpfilterout);   /* XXX - check result? */
 
 
-  if (WithCrypto) {
-    /* update crypto information for this message */
-    cur->security &= ~(GOODSIGN|BADSIGN);
-    cur->security |= crypt_query (cur->content);
+  /* update crypto information for this message */
+  cur->security &= ~(GOODSIGN|BADSIGN);
+  cur->security |= crypt_query (cur->content);
 
-    /* Remove color cache for this message, in case there
-       are color patterns for both ~g and ~V */
-    cur->pair = 0;
-  }
+  /* Remove color cache for this message, in case there
+     are color patterns for both ~g and ~V */
+  cur->pair = 0;
 
   if (builtin) {
     pager_t info;
 
-    if (WithCrypto
-        && (cur->security & APPLICATION_SMIME) && (cmflags & M_CM_VERIFY)) {
+    if ((cur->security & APPLICATION_SMIME) && (cmflags & M_CM_VERIFY)) {
       if (cur->security & GOODSIGN) {
         if (!crypt_smime_verify_sender (cur))
           mutt_message (_("S/MIME signature successfully verified."));
@@ -201,8 +198,7 @@ int mutt_display_message (HEADER * cur)
         mutt_error (_("S/MIME signature could NOT be verified."));
     }
 
-    if (WithCrypto
-        && (cur->security & APPLICATION_PGP) && (cmflags & M_CM_VERIFY)) {
+    if ((cur->security & APPLICATION_PGP) && (cmflags & M_CM_VERIFY)) {
       if (cur->security & GOODSIGN)
         mutt_message (_("PGP signature successfully verified."));
       else if (cur->security & PARTSIGN)
@@ -334,7 +330,7 @@ static void pipe_msg (HEADER * h, FILE * fp, int decode, int print)
 
   pipe_set_flags (decode, print, &cmflags, &chflags);
 
-  if (WithCrypto && decode && h->security & ENCRYPT) {
+  if (decode && h->security & ENCRYPT) {
     if (!crypt_valid_passphrase (h->security))
       return;
     endwin ();
@@ -367,7 +363,7 @@ static int _mutt_pipe_message(HEADER * h, char *cmd, int decode, int print,
 
     mutt_message_hook (Context, h, M_MESSAGEHOOK);
 
-    if (WithCrypto && decode) {
+    if (decode) {
       mutt_parse_mime_message (Context, h);
       if (h->security & ENCRYPT && !crypt_valid_passphrase (h->security))
         return 1;
@@ -386,7 +382,7 @@ static int _mutt_pipe_message(HEADER * h, char *cmd, int decode, int print,
   }
   else {                        /* handle tagged messages */
 
-    if (WithCrypto && decode) {
+    if (decode) {
       for (i = 0; i < Context->vcount; i++)
         if (Context->hdrs[Context->v2r[i]]->tagged) {
           mutt_message_hook (Context, Context->hdrs[Context->v2r[i]],
@@ -621,17 +617,14 @@ static void set_copy_flags (HEADER * hdr, int decode, int decrypt,
   *cmflags = 0;
   *chflags = CH_UPDATE_LEN;
 
-  if (WithCrypto && !decode && decrypt && (hdr->security & ENCRYPT)) {
-    if ((WithCrypto & APPLICATION_PGP)
-        && mutt_is_multipart_encrypted (hdr->content)) {
+  if (!decode && decrypt && (hdr->security & ENCRYPT)) {
+    if (mutt_is_multipart_encrypted (hdr->content)) {
       *chflags = CH_NONEWLINE | CH_XMIT | CH_MIME;
       *cmflags = M_CM_DECODE_PGP;
     }
-    else if ((WithCrypto & APPLICATION_PGP)
-             && mutt_is_application_pgp (hdr->content) & ENCRYPT)
+    else if (mutt_is_application_pgp (hdr->content) & ENCRYPT)
       decode = 1;
-    else if ((WithCrypto & APPLICATION_SMIME)
-             && mutt_is_application_smime (hdr->content) & ENCRYPT) {
+    else if (mutt_is_application_smime (hdr->content) & ENCRYPT) {
       *chflags = CH_NONEWLINE | CH_XMIT | CH_MIME;
       *cmflags = M_CM_DECODE_SMIME;
     }
@@ -702,10 +695,8 @@ int mutt_save_message (HEADER * h, int delete,
 
 
   if (h) {
-    if (WithCrypto) {
-      need_passphrase = h->security & ENCRYPT;
-      app = h->security;
-    }
+    need_passphrase = h->security & ENCRYPT;
+    app = h->security;
     mutt_message_hook (Context, h, M_MESSAGEHOOK);
     mutt_default_save (buf, sizeof (buf), h);
   }
@@ -723,10 +714,8 @@ int mutt_save_message (HEADER * h, int delete,
     if (h) {
       mutt_message_hook (Context, h, M_MESSAGEHOOK);
       mutt_default_save (buf, sizeof (buf), h);
-      if (WithCrypto) {
-        need_passphrase = h->security & ENCRYPT;
-        app = h->security;
-      }
+      need_passphrase = h->security & ENCRYPT;
+      app = h->security;
       h = NULL;
     }
   }
@@ -759,7 +748,7 @@ int mutt_save_message (HEADER * h, int delete,
   if (mutt_save_confirm (buf, &st) != 0)
     return -1;
 
-  if (WithCrypto && need_passphrase && (decode || decrypt)
+  if (need_passphrase && (decode || decrypt)
       && !crypt_valid_passphrase (app))
     return -1;
 
@@ -859,7 +848,7 @@ void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
     for (p = b->parameter; p; p = p->next) {
       l = m_strlen(buf);
 
-      rfc822_cat (tmp, sizeof (tmp), p->value, MimeSpecials);
+      rfc822_strcpy(tmp, sizeof(tmp), p->value, MimeSpecials);
       snprintf (buf + l, sizeof (buf) - l, "; %s=%s", p->attribute, tmp);
     }
   }
@@ -916,7 +905,7 @@ void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
   if (fp && (is_multipart (b) || mutt_is_message_type (b->type, b->subtype)))
     mutt_parse_part (fp, b);
 
-  if (WithCrypto && h) {
+  if (h) {
     if (h->content == b)
       h->security = 0;