X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=util%2Fcrypto.h;h=af3998e8466e346bdcef95310031d88e68742c7a;hb=30c4fa3702f90572afcd1984dbd7aba70f2b4fd9;hp=b23ca7472a6e05281d2b5d3bfe2f68ea11cd4d73;hpb=798aa789b5d117cf11697bc97dd982bd5a2c2ac8;p=notmuch

diff --git a/util/crypto.h b/util/crypto.h
index b23ca747..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;
     notmuch_decryption_policy_t decrypt;
-#if (GMIME_MAJOR_VERSION < 3)
-    GMimeCryptoContext* gpgctx;
-    GMimeCryptoContext* pkcs7ctx;
-    const char *gpgpath;
-#endif
 } _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