X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-crypt%2Fcrypt.c;h=60349cf0752bf2d77ad73ef1267df7620ba11eff;hb=7dea2ed3be5f5aaa2975647e69a414925ccb3cb8;hp=a413c50c7ce667fde3af751bfcf5e80d7271c640;hpb=74f4cb56b87554a520eb94b02b91a3ea09c8a564;p=apps%2Fmadmutt.git diff --git a/lib-crypt/crypt.c b/lib-crypt/crypt.c index a413c50..60349cf 100644 --- a/lib-crypt/crypt.c +++ b/lib-crypt/crypt.c @@ -153,7 +153,7 @@ int crypt_query (BODY * m) BODY *p; int u, v, w; - u = m->parts ? 0xffffffff : 0; /* Bits set in all parts */ + u = m->parts ? ~0 : 0; /* Bits set in all parts */ w = 0; /* Bits set in any part */ for (p = m->parts; p; p = p->next) { @@ -283,35 +283,6 @@ void crypt_extract_keys_from_messages(HEADER * h) -int crypt_get_keys (HEADER * msg, char **keylist) -{ - /* Do a quick check to make sure that we can find all of the encryption - * keys if the user has requested this service. - */ - - set_option (OPTPGPCHECKTRUST); - - *keylist = NULL; - - if (msg->security & ENCRYPT) { - if (msg->security & APPLICATION_PGP) { - if ((*keylist = crypt_pgp_findkeys (msg->env->to, msg->env->cc, - msg->env->bcc)) == NULL) - return (-1); - unset_option (OPTPGPCHECKTRUST); - } - if (msg->security & APPLICATION_SMIME) { - if ((*keylist = crypt_smime_findkeys (msg->env->to, msg->env->cc, - msg->env->bcc)) == NULL) - return (-1); - } - } - - return (0); -} - - - static void crypt_fetch_signatures (BODY ***signatures, BODY * a, int *n) { for (; a; a = a->next) { @@ -333,113 +304,97 @@ static void crypt_fetch_signatures (BODY ***signatures, BODY * a, int *n) int mutt_signed_handler (BODY * a, STATE * s) { - char tempfile[_POSIX_PATH_MAX]; - FILE * tempfp; + unsigned major, minor; char *protocol; - int protocol_major = TYPEOTHER; - char *protocol_minor = NULL; - + int rc, i, goodsig = 1, sigcnt = 0; BODY *b = a; - BODY **signatures = NULL; - int sigcnt = 0; - int i; - short goodsig = 1; - int rc = 0; protocol = parameter_getval(a->parameter, "protocol"); a = a->parts; - /* extract the protocol information */ - - if (protocol) { - char major[STRING]; - char *t; - - if ((protocol_minor = strchr (protocol, '/'))) - protocol_minor++; - - m_strcpy(major, sizeof(major), protocol); - if ((t = strchr (major, '/'))) - *t = '\0'; - - protocol_major = mutt_check_mime_type (major); + switch (mime_which_token(protocol, -1)) { + case MIME_APPLICATION_PGP_SIGNATURE: + major = TYPEAPPLICATION; + minor = MIME_PGP_SIGNATURE; + break; + case MIME_APPLICATION_X_PKCS7_SIGNATURE: + major = TYPEAPPLICATION; + minor = MIME_X_PKCS7_SIGNATURE; + break; + case MIME_APPLICATION_PKCS7_SIGNATURE: + major = TYPEAPPLICATION; + minor = MIME_PKCS7_SIGNATURE; + break; + case MIME_MULTIPART_MIXED: + major = TYPEMULTIPART; + minor = MIME_MIXED; + break; + + default: + state_printf(s, _("[-- Error: " + "Unknown multipart/signed protocol %s! --]\n\n"), + protocol); + return mutt_body_handler (a, s); } /* consistency check */ - - if (!(a && a->next && a->next->type == protocol_major && - !m_strcasecmp(a->next->subtype, protocol_minor))) { - state_attach_puts (_("[-- Error: " - "Inconsistent multipart/signed structure! --]\n\n"), - s); - return mutt_body_handler (a, s); - } - - - if (protocol_major == TYPEAPPLICATION - && !m_strcasecmp(protocol_minor, "pgp-signature")); - else if (protocol_major == TYPEAPPLICATION - && !(m_strcasecmp(protocol_minor, "x-pkcs7-signature") - && m_strcasecmp(protocol_minor, "pkcs7-signature"))); - else if (protocol_major == TYPEMULTIPART - && !m_strcasecmp(protocol_minor, "mixed")); - else { - state_printf (s, _("[-- Error: " - "Unknown multipart/signed protocol %s! --]\n\n"), - protocol); + if (!(a && a->next && a->next->type == major && + mime_which_token(a->next->subtype, -1) == minor)) + { + state_attach_puts(_("[-- Error: " + "Inconsistent multipart/signed structure! --]\n\n"), + s); return mutt_body_handler (a, s); } if (s->flags & M_DISPLAY) { + BODY **sigs = NULL; - crypt_fetch_signatures (&signatures, a->next, &sigcnt); - + crypt_fetch_signatures (&sigs, a->next, &sigcnt); if (sigcnt) { - tempfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL); - if (!tempfp) { + FILE *tmpfp = tmpfile(); + + if (!tmpfp) { mutt_error(_("Could not create temporary file")); } else { - crypt_write_signed(a, s, tempfp); - m_fclose(&tempfp); + crypt_write_signed(a, s, tmpfp); + rewind(tmpfp); for (i = 0; i < sigcnt; i++) { - if (signatures[i]->type == TYPEAPPLICATION - && !m_strcasecmp(signatures[i]->subtype, "pgp-signature")) { - if (crypt_pgp_verify_one (signatures[i], s, tempfile) != 0) - goodsig = 0; + if (sigs[i]->type == TYPEAPPLICATION) { + int subtype; - continue; - } + switch ((subtype = mime_which_token(sigs[i]->subtype, -1))) { + case MIME_PGP_SIGNATURE: + case MIME_X_PKCS7_SIGNATURE: + case MIME_PKCS7_SIGNATURE: + if (crypt_verify_one(sigs[i], s, tmpfp, subtype != MIME_PGP_SIGNATURE) != 0) + goodsig = 0; - if (signatures[i]->type == TYPEAPPLICATION - && (!m_strcasecmp(signatures[i]->subtype, "x-pkcs7-signature") - || !m_strcasecmp(signatures[i]->subtype, "pkcs7-signature"))) - { - if (crypt_smime_verify_one (signatures[i], s, tempfile) != 0) - goodsig = 0; + m_fclose(&tmpfp); + continue; - continue; + default: + break; + } } - state_printf (s, _("[-- Warning: " - "We can't verify %s/%s signatures. --]\n\n"), - TYPE (signatures[i]), signatures[i]->subtype); + state_printf(s, _("[-- Warning: " + "We can't verify %s/%s signatures. --]\n\n"), + TYPE (sigs[i]), sigs[i]->subtype); } } - mutt_unlink (tempfile); - b->goodsig = goodsig; - b->badsig = !goodsig; + b->badsig = !goodsig; /* Now display the signed body */ - state_attach_puts (_("[-- The following data is signed --]\n\n"), s); + state_attach_puts(_("[-- The following data is signed --]\n\n"), s); - - p_delete(&signatures); + p_delete(&sigs); + } 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); } rc = mutt_body_handler (a, s);