X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=util%2Fcrypto.c;h=99104e788b4d9132490e039d39c2b38e435e92b8;hb=9f05ceb994d1d674cf2f433f0d794b671fef38ec;hp=da9256f27869c679bc1a647762475add868a3c16;hpb=096d45a878ba9606f1677f66d346b14c3c274fa5;p=notmuch

diff --git a/util/crypto.c b/util/crypto.c
index da9256f2..99104e78 100644
--- a/util/crypto.c
+++ b/util/crypto.c
@@ -32,7 +32,6 @@ GMimeObject *
 _notmuch_crypto_decrypt (bool *attempted,
 			 notmuch_decryption_policy_t decrypt,
 			 notmuch_message_t *message,
-			 g_mime_3_unused(GMimeCryptoContext* crypto_ctx),
 			 GMimeMultipartEncrypted *part,
 			 GMimeDecryptResult **decrypt_result,
 			 GError **err)
@@ -41,8 +40,7 @@ _notmuch_crypto_decrypt (bool *attempted,
     if (decrypt == NOTMUCH_DECRYPT_FALSE)
 	return NULL;
 
-    /* the versions of notmuch that can support session key decryption */
-#if HAVE_GMIME_SESSION_KEYS
+    /* try decryption with session key if one is stashed */
     if (message) {
 	notmuch_message_properties_t *list = NULL;
 
@@ -66,7 +64,6 @@ _notmuch_crypto_decrypt (bool *attempted,
 	if (ret)
 	    return ret;
     }
-#endif
 
     if (err && *err) {
 	g_error_free (*err);
@@ -78,26 +75,10 @@ _notmuch_crypto_decrypt (bool *attempted,
 
     if (attempted)
 	*attempted = true;
-#if (GMIME_MAJOR_VERSION < 3)
-#if HAVE_GMIME_SESSION_KEYS
-    gboolean oldgetsk = g_mime_crypto_context_get_retrieve_session_key (crypto_ctx);
-    gboolean newgetsk = (decrypt == NOTMUCH_DECRYPT_TRUE && decrypt_result);
-    if (newgetsk != oldgetsk)
-	/* This could return an error, but we can't do anything about it, so ignore it */
-	g_mime_crypto_context_set_retrieve_session_key (crypto_ctx, newgetsk, NULL);
-#endif
-    ret = g_mime_multipart_encrypted_decrypt(part, crypto_ctx,
-					     decrypt_result, err);
-#if HAVE_GMIME_SESSION_KEYS
-    if (newgetsk != oldgetsk)
-	g_mime_crypto_context_set_retrieve_session_key (crypto_ctx, oldgetsk, NULL);
-#endif
-#else
     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,
 					     decrypt_result, err);
-#endif
     return ret;
 }