X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=crypt-gpgme.h;h=db048be791468197b1d2ef3ffb686a6e673e52bf;hp=224367a9dab28cbc677be04efb3f94df6f615877;hb=0dd6b2e7a21a844f2dcc306bb2d36096d3f9b664;hpb=df70e07e24add1869bcc9b7af2277d9d0c09a281

diff --git a/crypt-gpgme.h b/crypt-gpgme.h
index 224367a..db048be 100644
--- a/crypt-gpgme.h
+++ b/crypt-gpgme.h
@@ -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.
  */
 
 #ifndef CRYPT_GPGME_H
@@ -24,8 +15,8 @@
 void pgp_gpgme_init (void);
 void smime_gpgme_init (void);
 
-char *pgp_gpgme_findkeys (ADDRESS * to, ADDRESS * cc, ADDRESS * bcc);
-char *smime_gpgme_findkeys (ADDRESS * to, ADDRESS * cc, ADDRESS * bcc);
+char *pgp_gpgme_findkeys (address_t * to, address_t * cc, address_t * bcc);
+char *smime_gpgme_findkeys (address_t * to, address_t * cc, address_t * bcc);
 
 BODY *pgp_gpgme_encrypt_message (BODY * a, char *keylist, int sign);
 BODY *smime_gpgme_build_smime_entity (BODY * a, char *keylist);
@@ -37,9 +28,9 @@ int smime_gpgme_decrypt_mime (FILE * fpin, FILE ** fpout, BODY * b,
 
 int pgp_gpgme_check_traditional (FILE * fp, BODY * b, int tagged_only);
 
-void pgp_gpgme_application_handler (BODY * m, STATE * s);
-void smime_gpgme_application_handler (BODY * a, STATE * s);
-void pgp_gpgme_encrypted_handler (BODY * a, STATE * s);
+int pgp_gpgme_application_handler (BODY * m, STATE * s);
+int smime_gpgme_application_handler (BODY * a, STATE * s);
+int pgp_gpgme_encrypted_handler (BODY * a, STATE * s);
 
 BODY *pgp_gpgme_make_key_attachment (char *tempf);
 
@@ -49,6 +40,8 @@ BODY *smime_gpgme_sign_message (BODY * a);
 int pgp_gpgme_verify_one (BODY * sigbdy, STATE * s, const char *tempfile);
 int smime_gpgme_verify_one (BODY * sigbdy, STATE * s, const char *tempfile);
 
+int smime_gpgme_verify_sender (HEADER* h);
+
 int pgp_gpgme_send_menu (HEADER * msg, int *redraw);
 int smime_gpgme_send_menu (HEADER * msg, int *redraw);