X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=crypt-mod-smime-gpgme.c;h=fdf391bee22e1cde01a922605384a1bf98387474;hp=761dec9135bd40b328d90d981565167d4f97bf4f;hb=c5ca8b7eaa727392811813926cda758bceef80f1;hpb=f404a0ca916be07049af51a3022baaaaab94def6

diff --git a/crypt-mod-smime-gpgme.c b/crypt-mod-smime-gpgme.c
index 761dec9..fdf391b 100644
--- a/crypt-mod-smime-gpgme.c
+++ b/crypt-mod-smime-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.
  */
 
 /* 
@@ -45,73 +36,75 @@ static int crypt_mod_smime_valid_passphrase (void)
   return 1;
 }
 
-static int crypt_mod_smime_decrypt_mime (FILE *a, FILE **b, BODY *c, BODY **d)
+static int crypt_mod_smime_decrypt_mime (FILE * a, FILE ** b, BODY * c,
+                                         BODY ** d)
 {
   return smime_gpgme_decrypt_mime (a, b, c, d);
 }
 
-static void crypt_mod_smime_application_handler (BODY *m, STATE *s)
+static int crypt_mod_smime_application_handler (BODY * m, STATE * s)
 {
-  smime_gpgme_application_handler (m, s);
+  return smime_gpgme_application_handler (m, s);
 }
 
-static char *crypt_mod_smime_findkeys (ADDRESS *to, ADDRESS *cc, ADDRESS *bcc)
+static char *crypt_mod_smime_findkeys (address_t * to, address_t * cc,
+                                       address_t * bcc)
 {
   return smime_gpgme_findkeys (to, cc, bcc);
 }
 
-static BODY *crypt_mod_smime_sign_message (BODY *a)
+static BODY *crypt_mod_smime_sign_message (BODY * a)
 {
   return smime_gpgme_sign_message (a);
 }
 
-static int crypt_mod_smime_verify_one (BODY *sigbdy, STATE *s, const char *tempf)
+static int crypt_mod_smime_verify_one (BODY * sigbdy, STATE * s,
+                                       const char *tempf)
 {
   return smime_gpgme_verify_one (sigbdy, s, tempf);
 }
 
-static int crypt_mod_smime_send_menu (HEADER *msg, int *redraw)
+static int crypt_mod_smime_send_menu (HEADER * msg, int *redraw)
 {
   return smime_gpgme_send_menu (msg, redraw);
 }
 
-static BODY *crypt_mod_smime_build_smime_entity (BODY *a, char *certlist)
+static BODY *crypt_mod_smime_build_smime_entity (BODY * a, char *certlist)
 {
   return smime_gpgme_build_smime_entity (a, certlist);
 }
 
-static int crypt_mod_smime_verify_sender (HEADER *h)
+static int crypt_mod_smime_verify_sender (HEADER * h)
 {
   return smime_gpgme_verify_sender (h);
 }
 
-struct crypt_module_specs crypt_mod_smime_gpgme =
-  { APPLICATION_SMIME,
-    {
-      crypt_mod_smime_init,
-      crypt_mod_smime_void_passphrase,
-      crypt_mod_smime_valid_passphrase,
-      crypt_mod_smime_decrypt_mime,
-      crypt_mod_smime_application_handler,
-      NULL,			/* encrypted_handler */
-      crypt_mod_smime_findkeys,
-      crypt_mod_smime_sign_message,
-      crypt_mod_smime_verify_one,
-      crypt_mod_smime_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 */
-      crypt_mod_smime_verify_sender,
-      crypt_mod_smime_build_smime_entity,
-      NULL, 			/* smime_invoke_import */
-    }
-  };
+struct crypt_module_specs crypt_mod_smime_gpgme = { APPLICATION_SMIME,
+  {
+   crypt_mod_smime_init,
+   crypt_mod_smime_void_passphrase,
+   crypt_mod_smime_valid_passphrase,
+   crypt_mod_smime_decrypt_mime,
+   crypt_mod_smime_application_handler,
+   NULL,                        /* encrypted_handler */
+   crypt_mod_smime_findkeys,
+   crypt_mod_smime_sign_message,
+   crypt_mod_smime_verify_one,
+   crypt_mod_smime_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 */
+   crypt_mod_smime_verify_sender,
+   crypt_mod_smime_build_smime_entity,
+   NULL,                        /* smime_invoke_import */
+   }
+};
 
 #endif