more simplifications. also fix gpgme crypt menu

[apps/madmutt.git] / lib-crypt / crypt.h

diff --git a/lib-crypt/crypt.h b/lib-crypt/crypt.h
index 06bfd1d..6f7730d 100644 (file)
--- a/lib-crypt/crypt.h
+++ b/lib-crypt/crypt.h
@@ -89,10 +89,13 @@ int mutt_parse_crypt_hdr (char *, int);
 void convert_to_7bit (BODY *);
 
 
-/*-- crypt.c --*/
+/*-- new API --*/
+
+void crypt_invoke_import(FILE *stream, int smime);
+int crypt_send_menu(HEADER *msg, int *redraw, int smime);
 
-/* Print the current time. */
-void crypt_current_time (STATE * s, const char *app_name);
+
+/*-- crypt.c --*/
 
 /* Check out the type of encryption used and set the cached status
    values if there are any. */
@@ -154,11 +157,6 @@ BODY *crypt_pgp_sign_message (BODY * a);
    later.  This is necessary for $fcc_attach. */
 BODY *crypt_pgp_encrypt_message (BODY * a, char *keylist, int sign);
 
-/* Invoke the PGP command to import a key. */
-void crypt_pgp_invoke_import (const char *fname);
-
-int crypt_pgp_send_menu (HEADER * msg, int *redraw);
-
 /* fixme: needs documentation */
 int crypt_pgp_verify_one (BODY * sigbdy, STATE * s, const char *tempf);
 
@@ -195,14 +193,7 @@ BODY *crypt_smime_sign_message (BODY * a);
 /* fixme: needs documentation. */
 BODY *crypt_smime_build_smime_entity (BODY * a, char *certlist);
 
-/* Add a certificate and update index file (externally). */
-void crypt_smime_invoke_import(const char *infile);
-
-int crypt_smime_send_menu (HEADER * msg, int *redraw);
-
 /* fixme: needs documentation */
 int crypt_smime_verify_one (BODY * sigbdy, STATE * s, const char *tempf);
 
-void crypt_init (void);
-
 #endif /*MUTT_CRYPT_H */