X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-crypt%2Fcryptglue.c;h=742c4a0daa8e99e6aa59d73538de60a4c64bcdac;hp=79fc2465143c89324794d6c314edf149833a3fcf;hb=6d2a5b1e45ea9606d27a23c068bd4e8e5f94f341;hpb=777dc6d5374fd154ac626421c813961b8ab18f2d

diff --git a/lib-crypt/cryptglue.c b/lib-crypt/cryptglue.c
index 79fc246..742c4a0 100644
--- a/lib-crypt/cryptglue.c
+++ b/lib-crypt/cryptglue.c
@@ -24,13 +24,61 @@
 #include "mutt.h"
 #include "crypt.h"
 #include "crypt-mod.h"
-
-/*
-    Generic
-*/
-
-extern struct crypt_module_specs crypt_mod_pgp_gpgme;
-extern struct crypt_module_specs crypt_mod_smime_gpgme;
+#include "crypt-gpgme.h"
+
+static struct crypt_module_specs crypt_mod_smime_gpgme = { APPLICATION_SMIME,
+    {
+        smime_gpgme_init,
+        smime_gpgme_decrypt_mime,
+        smime_gpgme_application_handler,
+        NULL,                        /* encrypted_handler */
+        smime_gpgme_findkeys,
+        smime_gpgme_sign_message,
+        smime_gpgme_verify_one,
+        smime_gpgme_send_menu,
+
+        NULL,                        /* pgp_encrypt_message */
+        NULL,                        /* pgp_make_key_attachment */
+        NULL,                        /* pgp_check_traditional */
+        NULL,                        /* pgp_traditional_encryptsign */
+        NULL,                        /* pgp_invoke_getkeys */
+        NULL,                        /* pgp_invoke_import */
+        NULL,                        /* pgp_extract_keys_from_attachment_list */
+
+        NULL,                        /* smime_getkeys */
+        smime_gpgme_verify_sender,
+        smime_gpgme_build_smime_entity,
+        NULL,                        /* smime_invoke_import */
+    }
+};
+
+static struct crypt_module_specs crypt_mod_pgp_gpgme = { APPLICATION_PGP,
+    {
+        pgp_gpgme_init,
+        pgp_gpgme_decrypt_mime,
+        pgp_gpgme_application_handler,
+        pgp_gpgme_encrypted_handler,
+        pgp_gpgme_findkeys,
+        pgp_gpgme_sign_message,
+        pgp_gpgme_verify_one,
+        pgp_gpgme_send_menu,
+
+        /* PGP specific.  */
+        pgp_gpgme_encrypt_message,
+        NULL,                        /* pgp_make_key_attachment, */
+        pgp_gpgme_check_traditional,
+        NULL,                        /* pgp_traditional_encryptsign  */
+        NULL,                        /* pgp_invoke_getkeys  */
+        pgp_gpgme_invoke_import,     /* pgp_invoke_import  */
+        pgp_gpgme_from_attachment_list,
+                                     /* pgp_extract_keys_from_attachment_list  */
+
+        NULL,                        /* smime_getkeys */
+        NULL,                        /* smime_verify_sender */
+        NULL,                        /* smime_build_smime_entity */
+        NULL,                        /* smime_invoke_import */
+    }
+};
 
 void crypt_init (void)
 {
@@ -60,22 +108,6 @@ void crypt_invoke_message (int type)
 */
 
 
-/* Reset a PGP passphrase */
-void crypt_pgp_void_passphrase (void)
-{
-  if (CRYPT_MOD_CALL_CHECK (PGP, void_passphrase))
-    (CRYPT_MOD_CALL (PGP, void_passphrase)) ();
-}
-
-int crypt_pgp_valid_passphrase (void)
-{
-  if (CRYPT_MOD_CALL_CHECK (PGP, valid_passphrase))
-    return (CRYPT_MOD_CALL (PGP, valid_passphrase)) ();
-
-  return 0;
-}
-
-
 /* Decrypt a PGP/MIME message. */
 int crypt_pgp_decrypt_mime (FILE * a, FILE ** b, BODY * c, BODY ** d)
 {
@@ -209,21 +241,6 @@ void crypt_pgp_extract_keys_from_attachment_list (FILE * fp, int tag,
 */
 
 
-/* Reset an SMIME passphrase */
-void crypt_smime_void_passphrase (void)
-{
-  if (CRYPT_MOD_CALL_CHECK (SMIME, void_passphrase))
-    (CRYPT_MOD_CALL (SMIME, void_passphrase)) ();
-}
-
-int crypt_smime_valid_passphrase (void)
-{
-  if (CRYPT_MOD_CALL_CHECK (SMIME, valid_passphrase))
-    return (CRYPT_MOD_CALL (SMIME, valid_passphrase)) ();
-
-  return 0;
-}
-
 /* Decrypt am S/MIME message. */
 int crypt_smime_decrypt_mime (FILE * a, FILE ** b, BODY * c, BODY ** d)
 {