crypto: use stashed session-key properties for decryption, if available

[notmuch] / util / crypto.h

diff --git a/util/crypto.h b/util/crypto.h
index 80628dc528d258057561a37168d116437fa2d75c..0c62ac70d8f1cfde40634964654b2fb58c14e229 100644 (file)
--- a/util/crypto.h
+++ b/util/crypto.h
@@ -2,9 +2,8 @@
 #define _CRYPTO_H
 
 #include <stdbool.h>
-#if (GMIME_MAJOR_VERSION < 3)
 #include "gmime-extra.h"
-#endif
+#include "notmuch.h"
 
 typedef struct _notmuch_crypto {
     bool verify;
@@ -16,10 +15,18 @@ typedef struct _notmuch_crypto {
 #endif
 } _notmuch_crypto_t;
 
+GMimeObject *
+_notmuch_crypto_decrypt (notmuch_message_t *message,
+                        GMimeCryptoContext* crypto_ctx,
+                        GMimeMultipartEncrypted *part,
+                        GMimeDecryptResult **decrypt_result,
+                        GError **err);
 
 #if (GMIME_MAJOR_VERSION < 3)
-GMimeCryptoContext *
-_notmuch_crypto_get_gmime_context (_notmuch_crypto_t *crypto, const char *protocol);
+notmuch_status_t
+_notmuch_crypto_get_gmime_ctx_for_protocol (_notmuch_crypto_t *crypto,
+                                           const char *protocol,
+                                           GMimeCryptoContext **ctx);
 #endif
 
 void