projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more simplifications.
[apps/madmutt.git]
/
lib-crypt
/
smime.c
diff --git
a/lib-crypt/smime.c
b/lib-crypt/smime.c
index
fa7feac
..
24ed09a
100644
(file)
--- a/
lib-crypt/smime.c
+++ b/
lib-crypt/smime.c
@@
-9,33
+9,12
@@
* please see the file GPL in the top level source directory.
*/
* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <sys/wait.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <ctype.h>
+#include <lib-lib/lib-lib.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
#ifdef HAVE_SYS_RESOURCE_H
# include <sys/resource.h>
#endif
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-
#include <lib-mime/mime.h>
#include <lib-ui/curses.h>
#include <lib-mime/mime.h>
#include <lib-ui/curses.h>
@@
-756,7
+735,7
@@
char *smime_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];
@@
-1304,7
+1283,7
@@
BODY *smime_build_smime_entity (BODY * a, char *certlist)
return (NULL);
}
return (NULL);
}
- t =
mutt_new_body
();
+ t =
body_new
();
t->type = TYPEAPPLICATION;
t->subtype = m_strdup("x-pkcs7-mime");
parameter_setval(&t->parameter, "name", "smime.p7m");
t->type = TYPEAPPLICATION;
t->subtype = m_strdup("x-pkcs7-mime");
parameter_setval(&t->parameter, "name", "smime.p7m");
@@
-1420,7
+1399,7
@@
BODY *smime_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;
@@
-1436,7
+1415,7
@@
BODY *smime_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("x-pkcs7-signature");
t = t->parts->next;
t->type = TYPEAPPLICATION;
t->subtype = m_strdup("x-pkcs7-signature");