debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-12-23 01:44:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

mime-node: rename decrypted_child to unwrapped_child

Browse source 
When walking the MIME tree, we might need to extract a new MIME
object.  Thus far, we've only done it when decrypting
multipart/encrypted messages, but PKCS#7 (RFC 8551, S/MIME) has
several other transformations that warrant a comparable form of
unwrapping.

Make this member re-usable for PKCS#7 unwrappings as well as
multipart/encrypted decryptions.

This change is just a naming change, it has no effect on function.

Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
This commit is contained in:
Daniel Kahn Gillmor 2020-03-19 01:41:44 -04:00 committed by David Bremner
parent 98e9bda17f
commit 7de3d77d2d
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
mime-node.c
View file

@ -227,19 +227,19 @@ node_decrypt_and_verify (mime_node_t *node, GMimeObject *part)
GMimeMultipartEncrypted *encrypteddata = GMIME_MULTIPART_ENCRYPTED (part); GMimeMultipartEncrypted *encrypteddata = GMIME_MULTIPART_ENCRYPTED (part);
notmuch_message_t *message = NULL; notmuch_message_t *message = NULL;
if (! node->decrypted_child) { if (! node->unwrapped_child) {
for (mime_node_t *parent = node; parent; parent = parent->parent) for (mime_node_t *parent = node; parent; parent = parent->parent)
if (parent->envelope_file) { if (parent->envelope_file) {
message = parent->envelope_file; message = parent->envelope_file;
break; break;
} }
node->decrypted_child = _notmuch_crypto_decrypt (&node->decrypt_attempted, node->unwrapped_child = _notmuch_crypto_decrypt (&node->decrypt_attempted,
node->ctx->crypto->decrypt, node->ctx->crypto->decrypt,
message, message,
encrypteddata, &decrypt_result, &err); encrypteddata, &decrypt_result, &err);
} }
if (! node->decrypted_child) { if (! node->unwrapped_child) {
fprintf (stderr, "Failed to decrypt part: %s\n", fprintf (stderr, "Failed to decrypt part: %s\n",
err ? err->message : "no error explanation given"); err ? err->message : "no error explanation given");
goto DONE; goto DONE;
@ -380,8 +380,8 @@ mime_node_child (mime_node_t *parent, int child)
return NULL; return NULL;
if (GMIME_IS_MULTIPART (parent->part)) { if (GMIME_IS_MULTIPART (parent->part)) {
if (child == GMIME_MULTIPART_ENCRYPTED_CONTENT && parent->decrypted_child) if (child == GMIME_MULTIPART_ENCRYPTED_CONTENT && parent->unwrapped_child)
sub = parent->decrypted_child; sub = parent->unwrapped_child;
else else
sub = g_mime_multipart_get_part ( sub = g_mime_multipart_get_part (
GMIME_MULTIPART (parent->part), child); GMIME_MULTIPART (parent->part), child);

6
notmuch-client.h
View file

@ -395,8 +395,10 @@ struct mime_node {
struct mime_node_context *ctx; struct mime_node_context *ctx;
/* Internal: For successfully decrypted multipart parts, the /* Internal: For successfully decrypted multipart parts, the
* decrypted part to substitute for the second child. */ * decrypted part to substitute for the second child; or, for
GMimeObject *decrypted_child; * PKCS#7 parts, the part returned after removing/processing the
* PKCS#7 transformation */
GMimeObject *unwrapped_child;
/* Internal: The next child for depth-first traversal and the part /* Internal: The next child for depth-first traversal and the part
* number to assign it (or -1 if unknown). */ * number to assign it (or -1 if unknown). */