crypto: Make _notmuch_crypto_decrypt take a GMimeObject

As we prepare to handle S/MIME-encrypted PKCS#7 EnvelopedData (which
is not multipart), we don't want to be limited to passing only
GMimeMultipartEncrypted MIME parts to _notmuch_crypto_decrypt.

There is no functional change here, just a matter of adjusting how we
pass arguments internally.

Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>

diff --git a/lib/index.cc b/lib/index.cc
index f029b334be407bafa820bab04f01294642208fe9..da9a3abe06ecc00397d684a76c0b5e7e17c6cf5b 100644 (file)
--- a/lib/index.cc
+++ b/lib/index.cc
@@ -369,7 +369,7 @@ _index_content_type (notmuch_message_t *message, GMimeObject *part)
 
 static void
 _index_encrypted_mime_part (notmuch_message_t *message, notmuch_indexopts_t *indexopts,
 
 static void
 _index_encrypted_mime_part (notmuch_message_t *message, notmuch_indexopts_t *indexopts,

-                           GMimeMultipartEncrypted *part,
+                           GMimeObject *part,

                            _notmuch_message_crypto_t *msg_crypto);
 
 static void
                            _notmuch_message_crypto_t *msg_crypto);
 
 static void


@@ -439,7 +439,7 @@ _index_mime_part (notmuch_message_t *message,
                                     g_mime_multipart_get_part (multipart, i));
                if (i == GMIME_MULTIPART_ENCRYPTED_CONTENT) {
                    _index_encrypted_mime_part (message, indexopts,
                                     g_mime_multipart_get_part (multipart, i));
                if (i == GMIME_MULTIPART_ENCRYPTED_CONTENT) {
                    _index_encrypted_mime_part (message, indexopts,

-                                               GMIME_MULTIPART_ENCRYPTED (part),
+                                               part,

                                                msg_crypto);
                } else {
                    if (i != GMIME_MULTIPART_ENCRYPTED_VERSION) {
                                                msg_crypto);
                } else {
                    if (i != GMIME_MULTIPART_ENCRYPTED_VERSION) {


@@ -551,7 +551,7 @@ _index_mime_part (notmuch_message_t *message,
 static void
 _index_encrypted_mime_part (notmuch_message_t *message,
                            notmuch_indexopts_t *indexopts,
 static void
 _index_encrypted_mime_part (notmuch_message_t *message,
                            notmuch_indexopts_t *indexopts,

-                           GMimeMultipartEncrypted *encrypted_data,
+                           GMimeObject *encrypted_data,

                            _notmuch_message_crypto_t *msg_crypto)
 {
     notmuch_status_t status;
                            _notmuch_message_crypto_t *msg_crypto)
 {
     notmuch_status_t status;


@@ -603,7 +603,7 @@ _index_encrypted_mime_part (notmuch_message_t *message,
        g_object_unref (decrypt_result);
     }
     GMimeObject *toindex = clear;
        g_object_unref (decrypt_result);
     }
     GMimeObject *toindex = clear;

-    if (_notmuch_message_crypto_potential_payload (msg_crypto, clear, GMIME_OBJECT (encrypted_data), GMIME_MULTIPART_ENCRYPTED_CONTENT) &&
+    if (_notmuch_message_crypto_potential_payload (msg_crypto, clear, encrypted_data, GMIME_MULTIPART_ENCRYPTED_CONTENT) &&

        msg_crypto->decryption_status == NOTMUCH_MESSAGE_DECRYPTED_FULL) {
        toindex = _notmuch_repair_crypto_payload_skip_legacy_display (clear);
        if (toindex != clear)
        msg_crypto->decryption_status == NOTMUCH_MESSAGE_DECRYPTED_FULL) {
        toindex = _notmuch_repair_crypto_payload_skip_legacy_display (clear);
        if (toindex != clear)

diff --git a/mime-node.c b/mime-node.c
index b6431e3b48f54d44ba15e3645deaa6e83f26dae9..c2ee858d3c89b9aefa2e4ebd132371a9fb3b42c6 100644 (file)
--- a/mime-node.c
+++ b/mime-node.c
@@ -253,7 +253,6 @@ node_decrypt_and_verify (mime_node_t *node, GMimeObject *part)
     GError *err = NULL;
     GMimeDecryptResult *decrypt_result = NULL;
     notmuch_status_t status;
     GError *err = NULL;
     GMimeDecryptResult *decrypt_result = NULL;
     notmuch_status_t status;

-    GMimeMultipartEncrypted *encrypteddata = GMIME_MULTIPART_ENCRYPTED (part);

     notmuch_message_t *message = NULL;
 
     if (! node->unwrapped_child) {
     notmuch_message_t *message = NULL;
 
     if (! node->unwrapped_child) {


@@ -266,7 +265,7 @@ node_decrypt_and_verify (mime_node_t *node, GMimeObject *part)
        node->unwrapped_child = _notmuch_crypto_decrypt (&node->decrypt_attempted,
                                                         node->ctx->crypto->decrypt,
                                                         message,
        node->unwrapped_child = _notmuch_crypto_decrypt (&node->decrypt_attempted,
                                                         node->ctx->crypto->decrypt,
                                                         message,

-                                                        encrypteddata, &decrypt_result, &err);
+                                                        part, &decrypt_result, &err);

        if (node->unwrapped_child)
            set_unwrapped_child_destructor (node);
     }
        if (node->unwrapped_child)
            set_unwrapped_child_destructor (node);
     }

diff --git a/util/crypto.c b/util/crypto.c
index 0bb6f526868103009bcdec25c7872c9bc3e1d167..fbd5f011eae63fb570cf2a84a2b0c03e6493cd5f 100644 (file)
--- a/util/crypto.c
+++ b/util/crypto.c
@@ -34,7 +34,7 @@ GMimeObject *
 _notmuch_crypto_decrypt (bool *attempted,
                         notmuch_decryption_policy_t decrypt,
                         notmuch_message_t *message,
 _notmuch_crypto_decrypt (bool *attempted,
                         notmuch_decryption_policy_t decrypt,
                         notmuch_message_t *message,

-                        GMimeMultipartEncrypted *part,
+                        GMimeObject *part,

                         GMimeDecryptResult **decrypt_result,
                         GError **err)
 {
                         GMimeDecryptResult **decrypt_result,
                         GError **err)
 {


@@ -55,7 +55,7 @@ _notmuch_crypto_decrypt (bool *attempted,
            }
            if (attempted)
                *attempted = true;
            }
            if (attempted)
                *attempted = true;

-           ret = g_mime_multipart_encrypted_decrypt (part,
+           ret = g_mime_multipart_encrypted_decrypt (GMIME_MULTIPART_ENCRYPTED (part),

                                                      GMIME_DECRYPT_NONE,
                                                      notmuch_message_properties_value (list),
                                                      decrypt_result, err);
                                                      GMIME_DECRYPT_NONE,
                                                      notmuch_message_properties_value (list),
                                                      decrypt_result, err);


@@ -81,7 +81,7 @@ _notmuch_crypto_decrypt (bool *attempted,
     GMimeDecryptFlags flags = GMIME_DECRYPT_NONE;
     if (decrypt == NOTMUCH_DECRYPT_TRUE && decrypt_result)
        flags |= GMIME_DECRYPT_EXPORT_SESSION_KEY;
     GMimeDecryptFlags flags = GMIME_DECRYPT_NONE;
     if (decrypt == NOTMUCH_DECRYPT_TRUE && decrypt_result)
        flags |= GMIME_DECRYPT_EXPORT_SESSION_KEY;

-    ret = g_mime_multipart_encrypted_decrypt (part, flags, NULL,
+    ret = g_mime_multipart_encrypted_decrypt (GMIME_MULTIPART_ENCRYPTED (part), flags, NULL,

                                              decrypt_result, err);
     return ret;
 }
                                              decrypt_result, err);
     return ret;
 }

diff --git a/util/crypto.h b/util/crypto.h
index f8bda0d1b1084fe932d3e08a8bf8453129420961..4fa5599c755cfedc8e27aaef4e59dc83df3bd997 100644 (file)
--- a/util/crypto.h
+++ b/util/crypto.h
@@ -18,7 +18,7 @@ GMimeObject *
 _notmuch_crypto_decrypt (bool *attempted,
                         notmuch_decryption_policy_t decrypt,
                         notmuch_message_t *message,
 _notmuch_crypto_decrypt (bool *attempted,
                         notmuch_decryption_policy_t decrypt,
                         notmuch_message_t *message,

-                        GMimeMultipartEncrypted *part,
+                        GMimeObject *part,

                         GMimeDecryptResult **decrypt_result,
                         GError **err);
 
                         GMimeDecryptResult **decrypt_result,
                         GError **err);