debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 19:08:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli/crypto: treat failure to create a crypto context as fatal.

Browse source 
Silently ignoring signed/encrypted parts seems like the wrong idea,
and it also complicates future gmime-3.0 compatibility changes.
This commit is contained in:
David Bremner 2017-07-16 01:01:43 +02:00
parent f1bcb6b7c2
commit 1fdc08d0ff
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mime-node.c
View file

@ -245,10 +245,12 @@ _mime_node_create (mime_node_t *parent, GMimeObject *part)
GMimeContentType *content_type = g_mime_object_get_content_type (part); GMimeContentType *content_type = g_mime_object_get_content_type (part);
const char *protocol = g_mime_content_type_get_parameter (content_type, "protocol"); const char *protocol = g_mime_content_type_get_parameter (content_type, "protocol");
cryptoctx = notmuch_crypto_get_context (node->ctx->crypto, protocol); cryptoctx = notmuch_crypto_get_context (node->ctx->crypto, protocol);
if (!cryptoctx)
return NULL;
} }
/* Handle PGP/MIME parts */ /* Handle PGP/MIME parts */
if (GMIME_IS_MULTIPART_ENCRYPTED (part) && node->ctx->crypto->decrypt && cryptoctx) { if (GMIME_IS_MULTIPART_ENCRYPTED (part) && node->ctx->crypto->decrypt) {
if (node->nchildren != 2) { if (node->nchildren != 2) {
/* this violates RFC 3156 section 4, so we won't bother with it. */ /* this violates RFC 3156 section 4, so we won't bother with it. */
fprintf (stderr, "Error: %d part(s) for a multipart/encrypted " fprintf (stderr, "Error: %d part(s) for a multipart/encrypted "
@ -257,7 +259,7 @@ _mime_node_create (mime_node_t *parent, GMimeObject *part)
} else { } else {
node_decrypt_and_verify (node, part, cryptoctx); node_decrypt_and_verify (node, part, cryptoctx);
} }
} else if (GMIME_IS_MULTIPART_SIGNED (part) && node->ctx->crypto->verify && cryptoctx) { } else if (GMIME_IS_MULTIPART_SIGNED (part) && node->ctx->crypto->verify) {
if (node->nchildren != 2) { if (node->nchildren != 2) {
/* this violates RFC 3156 section 5, so we won't bother with it. */ /* this violates RFC 3156 section 5, so we won't bother with it. */
fprintf (stderr, "Error: %d part(s) for a multipart/signed message " fprintf (stderr, "Error: %d part(s) for a multipart/signed message "