X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=crypt.c;h=54d60fe82eccea567c413d9c9dced6e39807e87e;hp=d60e1849f09bc8bb0181432cb8859a44a695deca;hb=9218fd9d7e2a7976b34683c60cb94f7fda42141a;hpb=bbc4fd52516a8afefbd14c77e34f8389d6f0a6ed diff --git a/crypt.c b/crypt.c index d60e184..54d60fe 100644 --- a/crypt.c +++ b/crypt.c @@ -51,7 +51,7 @@ /* print the current time to avoid spoofing of the signature output */ -void crypt_current_time (STATE * s, char *app_name) +void crypt_current_time (STATE * s, const char *app_name) { time_t t; char p[STRING], tmp[STRING]; @@ -487,7 +487,7 @@ int crypt_write_signed (BODY * a, STATE * s, const char *tempfile) return -1; } - fseek (s->fpin, a->hdr_offset, 0); + fseeko (s->fpin, a->hdr_offset, 0); bytes = a->length + a->offset - a->hdr_offset; hadcr = 0; while (bytes > 0) { @@ -719,7 +719,7 @@ static void crypt_fetch_signatures (BODY *** signatures, BODY * a, int *n) * 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; @@ -731,9 +731,10 @@ void mutt_signed_handler (BODY * a, STATE * s) int sigcnt = 0; int i; short goodsig = 1; + int rc = 0; if (!WithCrypto) - return; + return (-1); protocol = mutt_get_parameter ("protocol", a->parameter); a = a->parts; @@ -761,8 +762,7 @@ void mutt_signed_handler (BODY * a, STATE * s) state_attach_puts (_("[-- Error: " "Inconsistent multipart/signed structure! --]\n\n"), s); - mutt_body_handler (a, s); - return; + return mutt_body_handler (a, s); } @@ -779,8 +779,7 @@ void mutt_signed_handler (BODY * a, STATE * s) 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) { @@ -834,8 +833,10 @@ void mutt_signed_handler (BODY * a, STATE * s) 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); + + return (rc); }