X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=crypt-mod-pgp-gpgme.c;h=977a8c1f828ee7bb5459fb55e70c225149611ee7;hp=bab9663a4fa79d83b572bed57494236cee2a31d9;hb=8682670f5c23aca480236b8456aa8192b154a3e0;hpb=f404a0ca916be07049af51a3022baaaaab94def6

diff --git a/crypt-mod-pgp-gpgme.c b/crypt-mod-pgp-gpgme.c
index bab9663..977a8c1 100644
--- a/crypt-mod-pgp-gpgme.c
+++ b/crypt-mod-pgp-gpgme.c
@@ -1,19 +1,10 @@
-/* 
+/*
+ * Copyright notice from original mutt:
  * Copyright (C) 2004 g10 Code GmbH
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
  */
 
 /* 
@@ -26,7 +17,7 @@
 
 #ifdef CRYPT_BACKEND_GPGME
 
-#include "crypt-mod.h"
+#include <lib-crypt/crypt-mod.h>
 #include "crypt-gpgme.h"
 
 static void crypt_mod_pgp_init (void)
@@ -45,80 +36,83 @@ static int crypt_mod_pgp_valid_passphrase (void)
   return 1;
 }
 
-static int crypt_mod_pgp_decrypt_mime (FILE *a, FILE **b, BODY *c, BODY **d)
+static int crypt_mod_pgp_decrypt_mime (FILE * a, FILE ** b, BODY * c,
+                                       BODY ** d)
 {
   return pgp_gpgme_decrypt_mime (a, b, c, d);
 }
 
-static void crypt_mod_pgp_application_handler (BODY *m, STATE *s)
+static int crypt_mod_pgp_application_handler (BODY * m, STATE * s)
 {
-  pgp_gpgme_application_handler (m, s);
+  return pgp_gpgme_application_handler (m, s);
 }
 
-static void crypt_mod_pgp_encrypted_handler (BODY *m, STATE *s)
+static int crypt_mod_pgp_encrypted_handler (BODY * m, STATE * s)
 {
-  pgp_gpgme_encrypted_handler (m, s);
+  return pgp_gpgme_encrypted_handler (m, s);
 }
 
-static int crypt_mod_pgp_check_traditional (FILE *fp, BODY *b, int tagged_only)
+static int crypt_mod_pgp_check_traditional (FILE * fp, BODY * b,
+                                            int tagged_only)
 {
   return pgp_gpgme_check_traditional (fp, b, tagged_only);
 }
 
-static char *crypt_mod_pgp_findkeys (ADDRESS *to, ADDRESS *cc, ADDRESS *bcc)
+static char *crypt_mod_pgp_findkeys (address_t * to, address_t * cc,
+                                     address_t * bcc)
 {
   return pgp_gpgme_findkeys (to, cc, bcc);
 }
 
-static BODY *crypt_mod_pgp_sign_message (BODY *a)
+static BODY *crypt_mod_pgp_sign_message (BODY * a)
 {
   return pgp_gpgme_sign_message (a);
 }
 
-static int crypt_mod_pgp_verify_one (BODY *sigbdy, STATE *s, const char *tempf)
+static int crypt_mod_pgp_verify_one (BODY * sigbdy, STATE * s,
+                                     const char *tempf)
 {
   return pgp_gpgme_verify_one (sigbdy, s, tempf);
 }
 
-static int crypt_mod_pgp_send_menu (HEADER *msg, int *redraw)
+static int crypt_mod_pgp_send_menu (HEADER * msg, int *redraw)
 {
   return pgp_gpgme_send_menu (msg, redraw);
 }
 
-static BODY *crypt_mod_pgp_encrypt_message (BODY *a, char *keylist, int sign)
+static BODY *crypt_mod_pgp_encrypt_message (BODY * a, char *keylist, int sign)
 {
   return pgp_gpgme_encrypt_message (a, keylist, sign);
 }
 
-struct crypt_module_specs crypt_mod_pgp_gpgme =
-  { APPLICATION_PGP,
-    {
-      /* Common.  */
-      crypt_mod_pgp_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 specific.  */
-      crypt_mod_pgp_encrypt_message,
-      NULL,			/* pgp_make_key_attachment, */
-      crypt_mod_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 */
-      NULL,			/* smime_verify_sender */
-      NULL,			/* smime_build_smime_entity */
-      NULL,			/* smime_invoke_import */
-    }
-  };
+struct crypt_module_specs crypt_mod_pgp_gpgme = { APPLICATION_PGP,
+  {
+   /* Common.  */
+   crypt_mod_pgp_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 specific.  */
+   crypt_mod_pgp_encrypt_message,
+   NULL,                        /* pgp_make_key_attachment, */
+   crypt_mod_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 */
+   NULL,                        /* smime_verify_sender */
+   NULL,                        /* smime_build_smime_entity */
+   NULL,                        /* smime_invoke_import */
+   }
+};
 
 #endif