projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
crypt.c
diff --git
a/crypt.c
b/crypt.c
index
d8339fe
..
402a497
100644
(file)
--- a/
crypt.c
+++ b/
crypt.c
@@
-17,12
+17,18
@@
#endif
#include "mutt.h"
#endif
#include "mutt.h"
+#include "ascii.h"
+#include "handler.h"
#include "mutt_curses.h"
#include "mime.h"
#include "copy.h"
#include "mutt_crypt.h"
#include "pgp.h"
#include "mutt_curses.h"
#include "mime.h"
#include "copy.h"
#include "mutt_crypt.h"
#include "pgp.h"
+#include "lib/mem.h"
+#include "lib/intl.h"
+#include "lib/str.h"
+
#include <sys/wait.h>
#include <string.h>
#include <stdlib.h>
#include <sys/wait.h>
#include <string.h>
#include <stdlib.h>
@@
-382,7
+388,7
@@
int mutt_is_application_smime (BODY * m)
/* no .p7c, .p10 support yet. */
/* no .p7c, .p10 support yet. */
- len =
mutt_str
len (t) - 4;
+ len =
str_
len (t) - 4;
if (len > 0 && *(t + len) == '.') {
len++;
if (!ascii_strcasecmp ((t + len), "p7m"))
if (len > 0 && *(t + len) == '.') {
len++;
if (!ascii_strcasecmp ((t + len), "p7m"))
@@
-524,7
+530,7
@@
void convert_to_7bit (BODY * a)
convert_to_7bit (a->parts);
}
else if (a->type == TYPEMESSAGE &&
convert_to_7bit (a->parts);
}
else if (a->type == TYPEMESSAGE &&
-
mutt_str
casecmp (a->subtype, "delivery-status")) {
+
str_
casecmp (a->subtype, "delivery-status")) {
if (a->encoding != ENC7BIT)
mutt_message_to_7bit (a, NULL);
}
if (a->encoding != ENC7BIT)
mutt_message_to_7bit (a, NULL);
}
@@
-701,7
+707,7
@@
static void crypt_fetch_signatures (BODY *** signatures, BODY * a, int *n)
crypt_fetch_signatures (signatures, a->parts, n);
else {
if ((*n % 5) == 0)
crypt_fetch_signatures (signatures, a->parts, n);
else {
if ((*n % 5) == 0)
-
safe
_realloc (signatures, (*n + 6) * sizeof (BODY **));
+
mem
_realloc (signatures, (*n + 6) * sizeof (BODY **));
(*signatures)[(*n)++] = a;
}
(*signatures)[(*n)++] = a;
}
@@
-713,7
+719,7
@@
static void crypt_fetch_signatures (BODY *** signatures, BODY * a, int *n)
* This routine verifies a "multipart/signed" body.
*/
* This routine verifies a "multipart/signed" body.
*/
-
void
mutt_signed_handler (BODY * a, STATE * s)
+
int
mutt_signed_handler (BODY * a, STATE * s)
{
char tempfile[_POSIX_PATH_MAX];
char *protocol;
{
char tempfile[_POSIX_PATH_MAX];
char *protocol;
@@
-725,9
+731,10
@@
void mutt_signed_handler (BODY * a, STATE * s)
int sigcnt = 0;
int i;
short goodsig = 1;
int sigcnt = 0;
int i;
short goodsig = 1;
+ int rc = 0;
if (!WithCrypto)
if (!WithCrypto)
- return;
+ return
(-1)
;
protocol = mutt_get_parameter ("protocol", a->parameter);
a = a->parts;
protocol = mutt_get_parameter ("protocol", a->parameter);
a = a->parts;
@@
-751,30
+758,28
@@
void mutt_signed_handler (BODY * a, STATE * s)
/* consistency check */
if (!(a && a->next && a->next->type == protocol_major &&
/* consistency check */
if (!(a && a->next && a->next->type == protocol_major &&
- !
mutt_str
casecmp (a->next->subtype, protocol_minor))) {
+ !
str_
casecmp (a->next->subtype, protocol_minor))) {
state_attach_puts (_("[-- Error: "
"Inconsistent multipart/signed structure! --]\n\n"),
s);
state_attach_puts (_("[-- Error: "
"Inconsistent multipart/signed structure! --]\n\n"),
s);
- mutt_body_handler (a, s);
- return;
+ return mutt_body_handler (a, s);
}
if ((WithCrypto & APPLICATION_PGP)
&& protocol_major == TYPEAPPLICATION
}
if ((WithCrypto & APPLICATION_PGP)
&& protocol_major == TYPEAPPLICATION
- && !
mutt_str
casecmp (protocol_minor, "pgp-signature"));
+ && !
str_
casecmp (protocol_minor, "pgp-signature"));
else if ((WithCrypto & APPLICATION_SMIME)
&& protocol_major == TYPEAPPLICATION
else if ((WithCrypto & APPLICATION_SMIME)
&& protocol_major == TYPEAPPLICATION
- && !(
mutt_str
casecmp (protocol_minor, "x-pkcs7-signature")
- &&
mutt_str
casecmp (protocol_minor, "pkcs7-signature")));
+ && !(
str_
casecmp (protocol_minor, "x-pkcs7-signature")
+ &&
str_
casecmp (protocol_minor, "pkcs7-signature")));
else if (protocol_major == TYPEMULTIPART
else if (protocol_major == TYPEMULTIPART
- && !
mutt_str
casecmp (protocol_minor, "mixed"));
+ && !
str_
casecmp (protocol_minor, "mixed"));
else {
state_printf (s, _("[-- Error: "
"Unknown multipart/signed protocol %s! --]\n\n"),
protocol);
else {
state_printf (s, _("[-- Error: "
"Unknown multipart/signed protocol %s! --]\n\n"),
protocol);
- mutt_body_handler (a, s);
- return;
+ return mutt_body_handler (a, s);
}
if (s->flags & M_DISPLAY) {
}
if (s->flags & M_DISPLAY) {
@@
-787,7
+792,7
@@
void mutt_signed_handler (BODY * a, STATE * s)
for (i = 0; i < sigcnt; i++) {
if ((WithCrypto & APPLICATION_PGP)
&& signatures[i]->type == TYPEAPPLICATION
for (i = 0; i < sigcnt; i++) {
if ((WithCrypto & APPLICATION_PGP)
&& signatures[i]->type == TYPEAPPLICATION
- && !
mutt_str
casecmp (signatures[i]->subtype, "pgp-signature")) {
+ && !
str_
casecmp (signatures[i]->subtype, "pgp-signature")) {
if (crypt_pgp_verify_one (signatures[i], s, tempfile) != 0)
goodsig = 0;
if (crypt_pgp_verify_one (signatures[i], s, tempfile) != 0)
goodsig = 0;
@@
-797,8
+802,8
@@
void mutt_signed_handler (BODY * a, STATE * s)
if ((WithCrypto & APPLICATION_SMIME)
&& signatures[i]->type == TYPEAPPLICATION
&&
if ((WithCrypto & APPLICATION_SMIME)
&& signatures[i]->type == TYPEAPPLICATION
&&
- (!
mutt_str
casecmp (signatures[i]->subtype, "x-pkcs7-signature")
- || !
mutt_str
casecmp (signatures[i]->subtype,
+ (!
str_
casecmp (signatures[i]->subtype, "x-pkcs7-signature")
+ || !
str_
casecmp (signatures[i]->subtype,
"pkcs7-signature"))) {
if (crypt_smime_verify_one (signatures[i], s, tempfile) != 0)
goodsig = 0;
"pkcs7-signature"))) {
if (crypt_smime_verify_one (signatures[i], s, tempfile) != 0)
goodsig = 0;
@@
-821,15
+826,17
@@
void mutt_signed_handler (BODY * a, STATE * s)
state_attach_puts (_("[-- The following data is signed --]\n\n"), s);
state_attach_puts (_("[-- The following data is signed --]\n\n"), s);
-
FREE
(&signatures);
+
mem_free
(&signatures);
}
else
state_attach_puts (_("[-- Warning: Can't find any signatures. --]\n\n"),
s);
}
}
else
state_attach_puts (_("[-- Warning: Can't find any signatures. --]\n\n"),
s);
}
- mutt_body_handler (a, s);
+
rc =
mutt_body_handler (a, s);
if (s->flags & M_DISPLAY && sigcnt)
state_attach_puts (_("\n[-- End of signed data --]\n"), s);
if (s->flags & M_DISPLAY && sigcnt)
state_attach_puts (_("\n[-- End of signed data --]\n"), s);
+
+ return (rc);
}
}