X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=util%2Fcrypto.h;h=dbb333eb4c5d955648134fd7de3896d52a2fae02;hb=096d45a878ba9606f1677f66d346b14c3c274fa5;hp=1ff0297db45077bdb491dfbf8d27775ae3c280bd;hpb=a18bbf7f155369f251b0513788eade23be3555d5;p=notmuch

diff --git a/util/crypto.h b/util/crypto.h
index 1ff0297d..dbb333eb 100644
--- a/util/crypto.h
+++ b/util/crypto.h
@@ -2,30 +2,31 @@
 #define _CRYPTO_H
 
 #include <stdbool.h>
-#if (GMIME_MAJOR_VERSION < 3)
 #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;
 
-
-#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
+GMimeObject *
+_notmuch_crypto_decrypt (bool *attempted,
+			 notmuch_decryption_policy_t decrypt,
+			 notmuch_message_t *message,
+			 GMimeCryptoContext* crypto_ctx,
+			 GMimeMultipartEncrypted *part,
+			 GMimeDecryptResult **decrypt_result,
+			 GError **err);
 
 void
 _notmuch_crypto_cleanup (_notmuch_crypto_t *crypto);
 
+#ifdef __cplusplus
+}
+#endif
 #endif