X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pgp.h;h=26bdbb0c8bfdbf440e9c629ed10badf361385a91;hp=bfcd8937816f12abeebefd0ffd4c63d1fc13513e;hb=3cb53df6efcb6b137bbab53c16da4eddbc5a1b2b;hpb=c3e57678c8be193fc137854020f3a90887be97c9

diff --git a/pgp.h b/pgp.h
index bfcd893..26bdbb0 100644
--- a/pgp.h
+++ b/pgp.h
@@ -9,8 +9,6 @@
  * please see the file GPL in the top level source directory.
  */
 
-#ifdef CRYPT_BACKEND_CLASSIC_PGP
-
 #include "mutt_crypt.h"
 #include "pgplib.h"
 
@@ -37,14 +35,14 @@ int pgp_decrypt_mime (FILE *, FILE **, BODY *, BODY **);
 /* pgp_key_t gpg_get_candidates (struct pgp_vinfo *, pgp_ring_t, LIST *); */
 pgp_key_t pgp_ask_for_key (char *, char *, short, pgp_ring_t);
 pgp_key_t pgp_get_candidates (pgp_ring_t, LIST *);
-pgp_key_t pgp_getkeybyaddr (ADDRESS *, short, pgp_ring_t);
+pgp_key_t pgp_getkeybyaddr (address_t *, short, pgp_ring_t);
 pgp_key_t pgp_getkeybystr (char *, short, pgp_ring_t);
 
-char *pgp_findKeys (ADDRESS * to, ADDRESS * cc, ADDRESS * bcc);
+char *pgp_findKeys (address_t * to, address_t * cc, address_t * bcc);
 
 void pgp_forget_passphrase (void);
-void pgp_application_pgp_handler (BODY *, STATE *);
-void pgp_encrypted_handler (BODY *, STATE *);
+int pgp_application_pgp_handler (BODY *, STATE *);
+int pgp_encrypted_handler (BODY *, STATE *);
 void pgp_extract_keys_from_attachment_list (FILE * fp, int tag, BODY * top);
 void pgp_void_passphrase (void);
 int pgp_valid_passphrase (void);
@@ -82,7 +80,7 @@ pid_t pgp_invoke_traditional (FILE ** pgpin, FILE ** pgpout, FILE ** pgperr,
 
 
 void pgp_invoke_import (const char *fname);
-void pgp_invoke_getkeys (ADDRESS *);
+void pgp_invoke_getkeys (address_t *);
 
 
 /* private ? */
@@ -92,5 +90,3 @@ BODY *pgp_encrypt_message (BODY *, char *, int);
 BODY *pgp_sign_message (BODY *);
 
 int pgp_send_menu (HEADER * msg, int *redraw);
-
-#endif /* CRYPT_BACKEND_CLASSIC_PGP */