X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-crypt%2Fcryptglue.c;fp=lib-crypt%2Fcryptglue.c;h=e349698c1e796cfe687e3a6914caadbb6aa370e4;hp=c6b4e94d9e2150410d7fb8628004f0d1a22261ac;hb=c55aa3dacb53b38f4acc9f8679927756c6ddde2a;hpb=64a23f5574b096605383ef1886c7d0d6c42aeeee diff --git a/lib-crypt/cryptglue.c b/lib-crypt/cryptglue.c index c6b4e94..e349698 100644 --- a/lib-crypt/cryptglue.c +++ b/lib-crypt/cryptglue.c @@ -23,60 +23,17 @@ #include "mutt.h" #include "crypt.h" -#include "crypt-gpgme.h" - -#define CRYPT_MOD_CALL_CHECK(identifier, func) \ - ((crypt_mod_##identifier##_gpgme).func) - -#define CRYPT_MOD_CALL(identifier, func) \ - (*((crypt_mod_##identifier##_gpgme).func)) - - -struct crypt_module_specs crypt_mod_SMIME_gpgme = { - NULL, /* encrypted_handler */ - - NULL, /* pgp_make_key_attachment */ - NULL, /* pgp_invoke_getkeys */ - - NULL, /* smime_getkeys */ - smime_gpgme_build_smime_entity, -}; - -struct crypt_module_specs crypt_mod_PGP_gpgme = { - pgp_gpgme_encrypted_handler, - - /* PGP specific. */ - NULL, /* pgp_make_key_attachment, */ - NULL, /* pgp_invoke_getkeys */ - - NULL, /* smime_getkeys */ - NULL, /* smime_build_smime_entity */ -}; - /* PGP */ -/* MIME handler for an PGP/MIME encrypted message. */ -int crypt_pgp_encrypted_handler (BODY * a, STATE * s) -{ - if (CRYPT_MOD_CALL_CHECK (PGP, encrypted_handler)) - return (CRYPT_MOD_CALL (PGP, encrypted_handler)) (a, s); - return (-1); -} - /* fixme: needs documentation. */ void crypt_pgp_invoke_getkeys (address_t * addr) { - if (CRYPT_MOD_CALL_CHECK (PGP, pgp_invoke_getkeys)) - (CRYPT_MOD_CALL (PGP, pgp_invoke_getkeys)) (addr); } /* Generate a PGP public key attachment. */ BODY *crypt_pgp_make_key_attachment (char *tempf) { - if (CRYPT_MOD_CALL_CHECK (PGP, pgp_make_key_attachment)) - return (CRYPT_MOD_CALL (PGP, pgp_make_key_attachment)) (tempf); - return NULL; } @@ -85,15 +42,5 @@ BODY *crypt_pgp_make_key_attachment (char *tempf) /* fixme: Needs documentation. */ void crypt_smime_getkeys (ENVELOPE * env) { - if (CRYPT_MOD_CALL_CHECK (SMIME, smime_getkeys)) - (CRYPT_MOD_CALL (SMIME, smime_getkeys)) (env); } -/* fixme: needs documentation. */ -BODY *crypt_smime_build_smime_entity (BODY * a, char *certlist) -{ - if (CRYPT_MOD_CALL_CHECK (SMIME, smime_build_smime_entity)) - return (CRYPT_MOD_CALL (SMIME, smime_build_smime_entity)) (a, certlist); - - return NULL; -}