X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-crypt%2Fpgp.h;h=86fba308986dc1af138a54287b7bb86f35c729eb;hb=6d2a5b1e45ea9606d27a23c068bd4e8e5f94f341;hp=30e17b84acf2609554ba0761365ec865e50e604f;hpb=4761fa78a6dfc9437caa6e6e0aac806e50e01c83;p=apps%2Fmadmutt.git

diff --git a/lib-crypt/pgp.h b/lib-crypt/pgp.h
index 30e17b8..86fba30 100644
--- a/lib-crypt/pgp.h
+++ b/lib-crypt/pgp.h
@@ -10,8 +10,6 @@
  */
 
 #include "crypt.h"
-#include "pgplib.h"
-
 
 /* prototypes */
 
@@ -30,23 +28,19 @@ int mutt_check_pgp (HEADER * h);
 
 int pgp_decrypt_mime (FILE *, FILE **, BODY *, BODY **);
 
-/* int pgp_string_matches_hint (const char *s, LIST * hints); */
+/* int pgp_string_matches_hint (const char *s, string_list_t * hints); */
 
-/* pgp_key_t gpg_get_candidates (struct pgp_vinfo *, pgp_ring_t, LIST *); */
+/* pgp_key_t gpg_get_candidates (struct pgp_vinfo *, pgp_ring_t, string_list_t *); */
 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_get_candidates (pgp_ring_t, string_list_t *);
 pgp_key_t pgp_getkeybyaddr (address_t *, short, pgp_ring_t);
-pgp_key_t pgp_getkeybystr (char *, short, pgp_ring_t);
+pgp_key_t pgp_getkeybystr (const char *, short, pgp_ring_t);
 
 char *pgp_findKeys (address_t * to, address_t * cc, address_t * bcc);
 
-void pgp_forget_passphrase (void);
 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);
-
 
 /* The PGP invocation interface - not really beautiful. */
 
@@ -73,7 +67,7 @@ pid_t pgp_invoke_verify_key (FILE ** pgpin, FILE ** pgpout, FILE ** pgperr,
                              const char *uids);
 pid_t pgp_invoke_list_keys (FILE ** pgpin, FILE ** pgpout, FILE ** pgperr,
                             int pgpinfd, int pgpoutfd, int pgperrfd,
-                            pgp_ring_t keyring, LIST * hints);
+                            pgp_ring_t keyring, string_list_t * hints);
 pid_t pgp_invoke_traditional (FILE ** pgpin, FILE ** pgpout, FILE ** pgperr,
                               int pgpinfd, int pgpoutfd, int pgperrfd,
                               const char *fname, const char *uids, int flags);