drop redirect functions

diff --git a/ncrypt/crypt_mod_pgp_classic.c b/ncrypt/crypt_mod_pgp_classic.c
index 0c2bce9913e71fabb025149795d205c506d256ee..d2fb036cef1909f6793f4941d6582898e749023e 100644 (file)
--- a/ncrypt/crypt_mod_pgp_classic.c
+++ b/ncrypt/crypt_mod_pgp_classic.c
@@ -34,116 +34,29 @@
 #include "pgpinvoke.h"
 #include "pgpkey.h"
 
-struct Address;
-struct Body;
-struct Header;
-struct State;
-
-static void crypt_mod_pgp_void_passphrase(void)
-{
-  pgp_void_passphrase();
-}
-
-static int crypt_mod_pgp_valid_passphrase(void)
-{
-  return pgp_valid_passphrase();
-}
-
-static int crypt_mod_pgp_decrypt_mime(FILE *a, FILE **b, struct Body *c, struct Body **d)
-{
-  return pgp_decrypt_mime(a, b, c, d);
-}
-
-static int crypt_mod_pgp_application_handler(struct Body *m, struct State *s)
-{
-  return pgp_application_pgp_handler(m, s);
-}
-
-static char *crypt_mod_pgp_findkeys(struct Address *addrlist, bool oppenc_mode)
-{
-  return pgp_find_keys(addrlist, oppenc_mode);
-}
-
-static struct Body *crypt_mod_pgp_sign_message(struct Body *a)
-{
-  return pgp_sign_message(a);
-}
-
-static int crypt_mod_pgp_verify_one(struct Body *sigbdy, struct State *s, const char *tempf)
-{
-  return pgp_verify_one(sigbdy, s, tempf);
-}
-
-static int crypt_mod_pgp_send_menu(struct Header *msg)
-{
-  return pgp_send_menu(msg);
-}
-
-static struct Body *crypt_mod_pgp_encrypt_message(struct Body *a, char *keylist, int sign)
-{
-  return pgp_encrypt_message(a, keylist, sign);
-}
-
-static struct Body *crypt_mod_pgp_make_key_attachment(char *tempf)
-{
-  return pgp_make_key_attachment(tempf);
-}
-
-static int crypt_mod_pgp_check_traditional(FILE *fp, struct Body *b, int just_one)
-{
-  return pgp_check_traditional(fp, b, just_one);
-}
-
-static struct Body *crypt_mod_pgp_traditional_encryptsign(struct Body *a,
-                                                          int flags, char *keylist)
-{
-  return pgp_traditional_encryptsign(a, flags, keylist);
-}
-
-static int crypt_mod_pgp_encrypted_handler(struct Body *m, struct State *s)
-{
-  return pgp_encrypted_handler(m, s);
-}
-
-static void crypt_mod_pgp_invoke_getkeys(struct Address *addr)
-{
-  pgp_invoke_getkeys(addr);
-}
-
-static void crypt_mod_pgp_invoke_import(const char *fname)
-{
-  pgp_invoke_import(fname);
-}
-
-static void crypt_mod_pgp_extract_keys_from_attachment_list(FILE *fp, int tag,
-                                                            struct Body *top)
-{
-  pgp_extract_keys_from_attachment_list(fp, tag, top);
-}
-
 // clang-format off
 struct CryptModuleSpecs crypt_mod_pgp_classic = {
   APPLICATION_PGP,
 
   NULL, /* init */
-  crypt_mod_pgp_void_passphrase,
-  crypt_mod_pgp_valid_passphrase,
-  crypt_mod_pgp_decrypt_mime,
-  crypt_mod_pgp_application_handler,
-  crypt_mod_pgp_encrypted_handler,
-  crypt_mod_pgp_findkeys,
-  crypt_mod_pgp_sign_message,
-  crypt_mod_pgp_verify_one,
-  crypt_mod_pgp_send_menu,
+  pgp_void_passphrase,
+  pgp_valid_passphrase,
+  pgp_decrypt_mime,
+  pgp_application_pgp_handler,
+  pgp_encrypted_handler,
+  pgp_find_keys,
+  pgp_sign_message,
+  pgp_verify_one,
+  pgp_send_menu,
   NULL, /* set_sender */
 
-  crypt_mod_pgp_encrypt_message,
-  crypt_mod_pgp_make_key_attachment,
-  crypt_mod_pgp_check_traditional,
-  crypt_mod_pgp_traditional_encryptsign,
-  crypt_mod_pgp_invoke_getkeys,
-  crypt_mod_pgp_invoke_import,
-  crypt_mod_pgp_extract_keys_from_attachment_list,
+  pgp_encrypt_message,
+  pgp_make_key_attachment,
+  pgp_check_traditional,
+  pgp_traditional_encryptsign,
+  pgp_invoke_getkeys,
+  pgp_invoke_import,
+  pgp_extract_keys_from_attachment_list,
 
   NULL, /* smime_getkeys */
   NULL, /* smime_verify_sender */

diff --git a/ncrypt/crypt_mod_pgp_gpgme.c b/ncrypt/crypt_mod_pgp_gpgme.c
index 7109c18fb86bc2f9d982c159491b8e41f00a31d9..16dba5d299e307a509a0417ccd36cee79cb9ff40 100644 (file)
--- a/ncrypt/crypt_mod_pgp_gpgme.c
+++ b/ncrypt/crypt_mod_pgp_gpgme.c
@@ -32,16 +32,6 @@
 #include "crypt_mod.h"
 #include "ncrypt.h"
 
-struct Address;
-struct Body;
-struct Header;
-struct State;
-
-static void crypt_mod_pgp_init(void)
-{
-  pgp_gpgme_init();
-}
-
 static void crypt_mod_pgp_void_passphrase(void)
 {
   /* Handled by gpg-agent.  */
@@ -53,56 +43,6 @@ static int crypt_mod_pgp_valid_passphrase(void)
   return 1;
 }
 
-static int crypt_mod_pgp_decrypt_mime(FILE *a, FILE **b, struct Body *c, struct Body **d)
-{
-  return pgp_gpgme_decrypt_mime(a, b, c, d);
-}
-
-static int crypt_mod_pgp_application_handler(struct Body *m, struct State *s)
-{
-  return pgp_gpgme_application_handler(m, s);
-}
-
-static int crypt_mod_pgp_encrypted_handler(struct Body *m, struct State *s)
-{
-  return pgp_gpgme_encrypted_handler(m, s);
-}
-
-static int crypt_mod_pgp_check_traditional(FILE *fp, struct Body *b, int just_one)
-{
-  return pgp_gpgme_check_traditional(fp, b, just_one);
-}
-
-static void crypt_mod_pgp_invoke_import(const char *fname)
-{
-  pgp_gpgme_invoke_import(fname);
-}
-
-static char *crypt_mod_pgp_findkeys(struct Address *addrlist, bool oppenc_mode)
-{
-  return pgp_gpgme_findkeys(addrlist, oppenc_mode);
-}
-
-static struct Body *crypt_mod_pgp_sign_message(struct Body *a)
-{
-  return pgp_gpgme_sign_message(a);
-}
-
-static int crypt_mod_pgp_verify_one(struct Body *sigbdy, struct State *s, const char *tempf)
-{
-  return pgp_gpgme_verify_one(sigbdy, s, tempf);
-}
-
-static int crypt_mod_pgp_send_menu(struct Header *msg)
-{
-  return pgp_gpgme_send_menu(msg);
-}
-
-static struct Body *crypt_mod_pgp_encrypt_message(struct Body *a, char *keylist, int sign)
-{
-  return pgp_gpgme_encrypt_message(a, keylist, sign);
-}
-
 static struct Body *crypt_mod_pgp_make_key_attachment(char *tempf)
 {
 #ifdef HAVE_GPGME_OP_EXPORT_KEYS
@@ -112,33 +52,28 @@ static struct Body *crypt_mod_pgp_make_key_attachment(char *tempf)
 #endif
 }
 
-static void crypt_mod_pgp_set_sender(const char *sender)
-{
-  mutt_gpgme_set_sender(sender);
-}
-
 // clang-format off
 struct CryptModuleSpecs crypt_mod_pgp_gpgme = {
   APPLICATION_PGP,
 
-  crypt_mod_pgp_init,
+  pgp_gpgme_init,
   crypt_mod_pgp_void_passphrase,
   crypt_mod_pgp_valid_passphrase,
-  crypt_mod_pgp_decrypt_mime,
-  crypt_mod_pgp_application_handler,
-  crypt_mod_pgp_encrypted_handler,
-  crypt_mod_pgp_findkeys,
-  crypt_mod_pgp_sign_message,
-  crypt_mod_pgp_verify_one,
-  crypt_mod_pgp_send_menu,
-  crypt_mod_pgp_set_sender,
-
-  crypt_mod_pgp_encrypt_message,
+  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,
+  mutt_gpgme_set_sender,
+
+  pgp_gpgme_encrypt_message,
   crypt_mod_pgp_make_key_attachment,
-  crypt_mod_pgp_check_traditional,
+  pgp_gpgme_check_traditional,
   NULL, /* pgp_traditional_encryptsign  */
   NULL, /* pgp_invoke_getkeys  */
-  crypt_mod_pgp_invoke_import,
+  pgp_gpgme_invoke_import,
   NULL, /* pgp_extract_keys_from_attachment_list  */
 
   NULL, /* smime_getkeys */

diff --git a/ncrypt/crypt_mod_smime_classic.c b/ncrypt/crypt_mod_smime_classic.c
index 08bf1aa09cd8854363469fc8390f7ff165f66d2e..f795238bafffcc2b6f5f925dbcf01de81d2aca60 100644 (file)
--- a/ncrypt/crypt_mod_smime_classic.c
+++ b/ncrypt/crypt_mod_smime_classic.c
@@ -32,86 +32,20 @@
 #include "ncrypt.h"
 #include "smime.h"
 
-struct Address;
-struct Body;
-struct Envelope;
-struct Header;
-struct State;
-
-static void crypt_mod_smime_void_passphrase(void)
-{
-  smime_void_passphrase();
-}
-
-static int crypt_mod_smime_valid_passphrase(void)
-{
-  return smime_valid_passphrase();
-}
-
-static int crypt_mod_smime_decrypt_mime(FILE *a, FILE **b, struct Body *c, struct Body **d)
-{
-  return smime_decrypt_mime(a, b, c, d);
-}
-
-static int crypt_mod_smime_application_handler(struct Body *m, struct State *s)
-{
-  return smime_application_smime_handler(m, s);
-}
-
-static char *crypt_mod_smime_findkeys(struct Address *addrlist, bool oppenc_mode)
-{
-  return smime_find_keys(addrlist, oppenc_mode);
-}
-
-static struct Body *crypt_mod_smime_sign_message(struct Body *a)
-{
-  return smime_sign_message(a);
-}
-
-static int crypt_mod_smime_verify_one(struct Body *sigbdy, struct State *s, const char *tempf)
-{
-  return smime_verify_one(sigbdy, s, tempf);
-}
-
-static int crypt_mod_smime_send_menu(struct Header *msg)
-{
-  return smime_send_menu(msg);
-}
-
-static void crypt_mod_smime_getkeys(struct Envelope *env)
-{
-  smime_getkeys(env);
-}
-
-static int crypt_mod_smime_verify_sender(struct Header *h)
-{
-  return smime_verify_sender(h);
-}
-
-static struct Body *crypt_mod_smime_build_smime_entity(struct Body *a, char *certlist)
-{
-  return smime_build_smime_entity(a, certlist);
-}
-
-static void crypt_mod_smime_invoke_import(char *infile, char *mailbox)
-{
-  smime_invoke_import(infile, mailbox);
-}
-
 // clang-format off
 struct CryptModuleSpecs crypt_mod_smime_classic = {
   APPLICATION_SMIME,
 
   NULL, /* init */
-  crypt_mod_smime_void_passphrase,
-  crypt_mod_smime_valid_passphrase,
-  crypt_mod_smime_decrypt_mime,
-  crypt_mod_smime_application_handler,
+  smime_void_passphrase,
+  smime_valid_passphrase,
+  smime_decrypt_mime,
+  smime_application_smime_handler,
   NULL, /* encrypted_handler */
-  crypt_mod_smime_findkeys,
-  crypt_mod_smime_sign_message,
-  crypt_mod_smime_verify_one,
-  crypt_mod_smime_send_menu,
+  smime_find_keys,
+  smime_sign_message,
+  smime_verify_one,
+  smime_send_menu,
   NULL, /* set_sender */
 
   NULL, /* pgp_encrypt_message */
@@ -122,9 +56,9 @@ struct CryptModuleSpecs crypt_mod_smime_classic = {
   NULL, /* pgp_invoke_import */
   NULL, /* pgp_extract_keys_from_attachment_list */
 
-  crypt_mod_smime_getkeys,
-  crypt_mod_smime_verify_sender,
-  crypt_mod_smime_build_smime_entity,
-  crypt_mod_smime_invoke_import,
+  smime_getkeys,
+  smime_verify_sender,
+  smime_build_smime_entity,
+  smime_invoke_import,
 };
 // clang-format on

diff --git a/ncrypt/crypt_mod_smime_gpgme.c b/ncrypt/crypt_mod_smime_gpgme.c
index 87755f1e2461c38e930ec8f5b03a70aa56255091..85011431c912f54bb6bb34f79e5d69a659ba24bb 100644 (file)
--- a/ncrypt/crypt_mod_smime_gpgme.c
+++ b/ncrypt/crypt_mod_smime_gpgme.c
@@ -32,16 +32,6 @@
 #include "crypt_mod.h"
 #include "ncrypt.h"
 
-struct Address;
-struct Body;
-struct Header;
-struct State;
-
-static void crypt_mod_smime_init(void)
-{
-  smime_gpgme_init();
-}
-
 static void crypt_mod_smime_void_passphrase(void)
 {
   /* Handled by gpg-agent.  */
@@ -53,60 +43,20 @@ static int crypt_mod_smime_valid_passphrase(void)
   return 1;
 }
 
-static int crypt_mod_smime_decrypt_mime(FILE *a, FILE **b, struct Body *c, struct Body **d)
-{
-  return smime_gpgme_decrypt_mime(a, b, c, d);
-}
-
-static int crypt_mod_smime_application_handler(struct Body *m, struct State *s)
-{
-  return smime_gpgme_application_handler(m, s);
-}
-
-static char *crypt_mod_smime_findkeys(struct Address *addrlist, bool oppenc_mode)
-{
-  return smime_gpgme_findkeys(addrlist, oppenc_mode);
-}
-
-static struct Body *crypt_mod_smime_sign_message(struct Body *a)
-{
-  return smime_gpgme_sign_message(a);
-}
-
-static int crypt_mod_smime_verify_one(struct Body *sigbdy, struct State *s, const char *tempf)
-{
-  return smime_gpgme_verify_one(sigbdy, s, tempf);
-}
-
-static int crypt_mod_smime_send_menu(struct Header *msg)
-{
-  return smime_gpgme_send_menu(msg);
-}
-
-static struct Body *crypt_mod_smime_build_smime_entity(struct Body *a, char *certlist)
-{
-  return smime_gpgme_build_smime_entity(a, certlist);
-}
-
-static int crypt_mod_smime_verify_sender(struct Header *h)
-{
-  return smime_gpgme_verify_sender(h);
-}
-
 // clang-format off
 struct CryptModuleSpecs crypt_mod_smime_gpgme = {
   APPLICATION_SMIME,
 
-  crypt_mod_smime_init,
+  smime_gpgme_init,
   crypt_mod_smime_void_passphrase,
   crypt_mod_smime_valid_passphrase,
-  crypt_mod_smime_decrypt_mime,
-  crypt_mod_smime_application_handler,
+  smime_gpgme_decrypt_mime,
+  smime_gpgme_application_handler,
   NULL, /* encrypted_handler */
-  crypt_mod_smime_findkeys,
-  crypt_mod_smime_sign_message,
-  crypt_mod_smime_verify_one,
-  crypt_mod_smime_send_menu,
+  smime_gpgme_findkeys,
+  smime_gpgme_sign_message,
+  smime_gpgme_verify_one,
+  smime_gpgme_send_menu,
   NULL, /* set_sender */
 
   NULL, /* pgp_encrypt_message */
@@ -118,8 +68,8 @@ struct CryptModuleSpecs crypt_mod_smime_gpgme = {
   NULL, /* pgp_extract_keys_from_attachment_list */
 
   NULL, /* smime_getkeys */
-  crypt_mod_smime_verify_sender,
-  crypt_mod_smime_build_smime_entity,
+  smime_gpgme_verify_sender,
+  smime_gpgme_build_smime_entity,
   NULL, /* smime_invoke_import */
 };
 // clang-format on