X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sendlib.c;h=03dd11a70b7c78987c66f43675da63dbf5fb395f;hp=b2d283d8e93c7f12f0165cce66ceca68fc348c8c;hb=b934795055e8c16e6cb7c9687a4dce815cb300e6;hpb=7a368b3670a90656b2e0e724ed3efd79221f3d31

diff --git a/sendlib.c b/sendlib.c
index b2d283d..03dd11a 100644
--- a/sendlib.c
+++ b/sendlib.c
@@ -25,12 +25,11 @@
 #include "handler.h"
 #include "recvattach.h"
 #include "mutt_curses.h"
-#include "rfc2047.h"
 #include "mx.h"
 #include "copy.h"
 #include "pager.h"
 #include "charset.h"
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
 #include "mutt_idna.h"
 
 #include "lib/debug.h"
@@ -364,9 +363,7 @@ int mutt_write_mime_header (BODY * a, FILE * f)
   return (ferror (f) ? -1 : 0);
 }
 
-# define write_as_text_part(a)  (mutt_is_text_part(a) \
-                                 || ((WithCrypto & APPLICATION_PGP)\
-                                      && mutt_is_application_pgp(a)))
+# define write_as_text_part(a)  (mutt_is_text_part(a) || mutt_is_application_pgp(a))
 
 int mutt_write_mime_body (BODY * a, FILE * f)
 {
@@ -399,9 +396,7 @@ int mutt_write_mime_body (BODY * a, FILE * f)
   }
 
   /* This is pretty gross, but it's the best solution for now... */
-  if ((WithCrypto & APPLICATION_PGP)
-      && a->type == TYPEAPPLICATION
-      && m_strcmp(a->subtype, "pgp-encrypted") == 0) {
+  if (a->type == TYPEAPPLICATION && !m_strcmp(a->subtype, "pgp-encrypted")) {
     fputs ("Version: 1\n", f);
     return 0;
   }
@@ -745,7 +740,7 @@ static size_t convert_file_from_to (FILE * file,
   for (c = tocodes, i = 0; c; c = c1 ? c1 + 1 : 0, i++) {
     if ((c1 = strchr (c, ':')) == c)
       continue;
-    tcode[i] = str_substrdup (c, c1);
+    tcode[i] = m_substrdup(c, c1);
   }
 
   ret = (size_t) (-1);
@@ -754,7 +749,7 @@ static size_t convert_file_from_to (FILE * file,
     for (c = fromcodes; c; c = c1 ? c1 + 1 : 0) {
       if ((c1 = strchr (c, ':')) == c)
         continue;
-      fcode = str_substrdup (c, c1);
+      fcode = m_substrdup(c, c1);
 
       ret = convert_file_to (file, fcode, ncodes, (const char **) tcode,
                              &cn, info);
@@ -938,7 +933,7 @@ int mutt_lookup_mime_type (BODY * att, const char *path)
 
             for (q = p; *q && !ISSPACE (*q); q++);
 
-            str_substrcpy (subtype, p, q, sizeof (subtype));
+            m_strncpy(subtype, sizeof(subtype), p, q - p);
 
             if ((type = mutt_check_mime_type (ct)) == TYPEOTHER)
               m_strcpy(xtype, sizeof(xtype), ct);
@@ -956,8 +951,8 @@ bye:
 
   if (type != TYPEOTHER || *xtype != '\0') {
     att->type = type;
-    str_replace (&att->subtype, subtype);
-    str_replace (&att->xtype, xtype);
+    m_strreplace(&att->subtype, subtype);
+    m_strreplace(&att->xtype, xtype);
   }
 
   return (type);
@@ -1181,14 +1176,12 @@ BODY *mutt_make_message_attach (CONTEXT * ctx, HEADER * hdr, int attach_msg)
   BODY *body;
   FILE *fp;
   int cmflags, chflags;
-  int pgp = WithCrypto ? hdr->security : 0;
+  int pgp = hdr->security;
 
-  if (WithCrypto) {
-    if ((option (OPTMIMEFORWDECODE) || option (OPTFORWDECRYPT)) &&
-        (hdr->security & ENCRYPT)) {
-      if (!crypt_valid_passphrase (hdr->security))
-        return (NULL);
-    }
+  if ((option (OPTMIMEFORWDECODE) || option (OPTFORWDECRYPT)) &&
+      (hdr->security & ENCRYPT)) {
+    if (!crypt_valid_passphrase (hdr->security))
+      return (NULL);
   }
 
   mutt_mktemp (buffer);
@@ -1213,26 +1206,20 @@ BODY *mutt_make_message_attach (CONTEXT * ctx, HEADER * hdr, int attach_msg)
   if (!attach_msg && option (OPTMIMEFORWDECODE)) {
     chflags |= CH_MIME | CH_TXTPLAIN;
     cmflags = M_CM_DECODE | M_CM_CHARCONV;
-    if ((WithCrypto & APPLICATION_PGP))
-      pgp &= ~PGPENCRYPT;
-    if ((WithCrypto & APPLICATION_SMIME))
-      pgp &= ~SMIMEENCRYPT;
+    pgp &= ~(PGPENCRYPT|SMIMEENCRYPT);
   }
-  else if (WithCrypto && option (OPTFORWDECRYPT) && (hdr->security & ENCRYPT)) {
-    if ((WithCrypto & APPLICATION_PGP)
-        && mutt_is_multipart_encrypted (hdr->content)) {
+  else if (option (OPTFORWDECRYPT) && (hdr->security & ENCRYPT)) {
+    if (mutt_is_multipart_encrypted (hdr->content)) {
       chflags |= CH_MIME | CH_NONEWLINE;
       cmflags = M_CM_DECODE_PGP;
       pgp &= ~PGPENCRYPT;
     }
-    else if ((WithCrypto & APPLICATION_PGP)
-             && (mutt_is_application_pgp (hdr->content) & PGPENCRYPT)) {
+    else if (mutt_is_application_pgp (hdr->content) & PGPENCRYPT) {
       chflags |= CH_MIME | CH_TXTPLAIN;
       cmflags = M_CM_DECODE | M_CM_CHARCONV;
       pgp &= ~PGPENCRYPT;
     }
-    else if ((WithCrypto & APPLICATION_SMIME)
-             && mutt_is_application_smime (hdr->content) & SMIMEENCRYPT) {
+    else if (mutt_is_application_smime (hdr->content) & SMIMEENCRYPT) {
       chflags |= CH_MIME | CH_TXTPLAIN;
       cmflags = M_CM_DECODE | M_CM_CHARCONV;
       pgp &= ~SMIMEENCRYPT;
@@ -1248,8 +1235,7 @@ BODY *mutt_make_message_attach (CONTEXT * ctx, HEADER * hdr, int attach_msg)
   body->hdr->offset = 0;
   /* we don't need the user headers here */
   body->hdr->env = mutt_read_rfc822_header (fp, body->hdr, 0, 0);
-  if (WithCrypto)
-    body->hdr->security = pgp;
+  body->hdr->security = pgp;
   mutt_update_encoding (body);
   body->parts = body->hdr->content;
 
@@ -2398,8 +2384,7 @@ int mutt_write_fcc (const char *path, HEADER * hdr, const char *msgid,
 
 
   /* (postponment) if the mail is to be signed or encrypted, save this info */
-  if ((WithCrypto & APPLICATION_PGP)
-      && post && (hdr->security & APPLICATION_PGP)) {
+  if (post && (hdr->security & APPLICATION_PGP)) {
     fputs ("X-Mutt-PGP: ", msg->fp);
     if (hdr->security & ENCRYPT)
       fputc ('E', msg->fp);
@@ -2414,8 +2399,7 @@ int mutt_write_fcc (const char *path, HEADER * hdr, const char *msgid,
   }
 
   /* (postponment) if the mail is to be signed or encrypted, save this info */
-  if ((WithCrypto & APPLICATION_SMIME)
-      && post && (hdr->security & APPLICATION_SMIME)) {
+  if (post && (hdr->security & APPLICATION_SMIME)) {
     fputs ("X-Mutt-SMIME: ", msg->fp);
     if (hdr->security & ENCRYPT) {
       fputc ('E', msg->fp);