X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=util%2Fcrypto.h;h=af3998e8466e346bdcef95310031d88e68742c7a;hb=b7ac4c05e118047442378f58eeb69d43bd1cbdb1;hp=0c62ac70d8f1cfde40634964654b2fb58c14e229;hpb=a99058540823cd520cf2a5333e8ffe99799aa285;p=notmuch

diff --git a/util/crypto.h b/util/crypto.h
index 0c62ac70..af3998e8 100644
--- a/util/crypto.h
+++ b/util/crypto.h
@@ -5,31 +5,27 @@
 #include "gmime-extra.h"
 #include "notmuch.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct _notmuch_crypto {
     bool verify;
-    bool decrypt;
-#if (GMIME_MAJOR_VERSION < 3)
-    GMimeCryptoContext* gpgctx;
-    GMimeCryptoContext* pkcs7ctx;
-    const char *gpgpath;
-#endif
+    notmuch_decryption_policy_t decrypt;
 } _notmuch_crypto_t;
 
 GMimeObject *
-_notmuch_crypto_decrypt (notmuch_message_t *message,
-			 GMimeCryptoContext* crypto_ctx,
+_notmuch_crypto_decrypt (bool *attempted,
+			 notmuch_decryption_policy_t decrypt,
+			 notmuch_message_t *message,
 			 GMimeMultipartEncrypted *part,
 			 GMimeDecryptResult **decrypt_result,
 			 GError **err);
 
-#if (GMIME_MAJOR_VERSION < 3)
-notmuch_status_t
-_notmuch_crypto_get_gmime_ctx_for_protocol (_notmuch_crypto_t *crypto,
-					    const char *protocol,
-					    GMimeCryptoContext **ctx);
-#endif
-
 void
 _notmuch_crypto_cleanup (_notmuch_crypto_t *crypto);
 
+#ifdef __cplusplus
+}
+#endif
 #endif