projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more include simplifications
[apps/madmutt.git]
/
lib-crypt
/
pgp.c
diff --git
a/lib-crypt/pgp.c
b/lib-crypt/pgp.c
index
1cbcc6f
..
8875ed9
100644
(file)
--- a/
lib-crypt/pgp.c
+++ b/
lib-crypt/pgp.c
@@
-17,15
+17,11
@@
* a message.
*/
* a message.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
+#ifdef HAVE_SYS_RESOURCE_H
+# include <sys/resource.h>
+#endif
#include <lib-mime/mime.h>
#include <lib-mime/mime.h>
@@
-39,27
+35,6
@@
#include "copy.h"
#include "attach.h"
#include "copy.h"
#include "attach.h"
-
-#include <sys/wait.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <ctype.h>
-
-#ifdef HAVE_LOCALE_H
-#include <locale.h>
-#endif
-
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-
-#ifdef HAVE_SYS_RESOURCE_H
-# include <sys/resource.h>
-#endif
-
#include "crypt.h"
#include "crypt.h"
@@
-914,7
+889,7
@@
int pgp_encrypted_handler (BODY * a, STATE * s)
state_attach_puts (_("[-- End of PGP/MIME encrypted data --]\n"), s);
}
state_attach_puts (_("[-- End of PGP/MIME encrypted data --]\n"), s);
}
-
mutt_free_body
(&tattach);
+
body_list_wipe
(&tattach);
/* clear 'Invoking...' message, since there's no error */
mutt_message _("PGP message successfully decrypted.");
} else {
/* clear 'Invoking...' message, since there's no error */
mutt_message _("PGP message successfully decrypted.");
} else {
@@
-1023,7
+998,7
@@
BODY *pgp_sign_message (BODY * a)
return (NULL); /* fatal error while signing */
}
return (NULL); /* fatal error while signing */
}
- t =
mutt_new_body
();
+ t =
body_new
();
t->type = TYPEMULTIPART;
t->subtype = m_strdup("signed");
t->encoding = ENC7BIT;
t->type = TYPEMULTIPART;
t->subtype = m_strdup("signed");
t->encoding = ENC7BIT;
@@
-1037,7
+1012,7
@@
BODY *pgp_sign_message (BODY * a)
t->parts = a;
a = t;
t->parts = a;
a = t;
- t->parts->next =
mutt_new_body
();
+ t->parts->next =
body_new
();
t = t->parts->next;
t->type = TYPEAPPLICATION;
t->subtype = m_strdup("pgp-signature");
t = t->parts->next;
t->type = TYPEAPPLICATION;
t->subtype = m_strdup("pgp-signature");
@@
-1103,7
+1078,7
@@
char *pgp_findKeys (address_t * to, address_t * cc, address_t * bcc)
if (fqdn)
rfc822_qualify (tmp, fqdn);
if (fqdn)
rfc822_qualify (tmp, fqdn);
-
tmp = mutt_remove_duplicates (
tmp);
+
address_list_uniq(&
tmp);
for (p = tmp; p; p = p->next) {
char buf[LONG_STRING];
for (p = tmp; p; p = p->next) {
char buf[LONG_STRING];
@@
-1269,7
+1244,7
@@
BODY *pgp_encrypt_message (BODY * a, char *keylist, int sign)
return (NULL);
}
return (NULL);
}
- t =
mutt_new_body
();
+ t =
body_new
();
t->type = TYPEMULTIPART;
t->subtype = m_strdup("encrypted");
t->encoding = ENC7BIT;
t->type = TYPEMULTIPART;
t->subtype = m_strdup("encrypted");
t->encoding = ENC7BIT;
@@
-1279,12
+1254,12
@@
BODY *pgp_encrypt_message (BODY * a, char *keylist, int sign)
parameter_set_boundary(&t->parameter);
parameter_setval(&t->parameter, "protocol", "application/pgp-encrypted");
parameter_set_boundary(&t->parameter);
parameter_setval(&t->parameter, "protocol", "application/pgp-encrypted");
- t->parts =
mutt_new_body
();
+ t->parts =
body_new
();
t->parts->type = TYPEAPPLICATION;
t->parts->subtype = m_strdup("pgp-encrypted");
t->parts->encoding = ENC7BIT;
t->parts->type = TYPEAPPLICATION;
t->parts->subtype = m_strdup("pgp-encrypted");
t->parts->encoding = ENC7BIT;
- t->parts->next =
mutt_new_body
();
+ t->parts->next =
body_new
();
t->parts->next->type = TYPEAPPLICATION;
t->parts->next->subtype = m_strdup("octet-stream");
t->parts->next->encoding = ENC7BIT;
t->parts->next->type = TYPEAPPLICATION;
t->parts->next->subtype = m_strdup("octet-stream");
t->parts->next->encoding = ENC7BIT;
@@
-1437,7
+1412,7
@@
BODY *pgp_traditional_encryptsign (BODY * a, int flags, char *keylist)
return NULL;
}
return NULL;
}
- b =
mutt_new_body
();
+ b =
body_new
();
b->encoding = ENC7BIT;
b->encoding = ENC7BIT;