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 3a2a207..6f7730d 100644 (file)
--- a/lib-crypt/crypt.h
+++ b/lib-crypt/crypt.h
@@ -16,14 +16,13 @@
 #ifndef MUTT_CRYPT_H
 #define MUTT_CRYPT_H
 
-#include "mutt.h"               /* Need this to declare BODY, address_t. STATE etc. */
+#include <lib-mime/mime.h>
 #include "state.h"
 
 /* FIXME: They should be pointer to anonymous structures for better
    information hiding. */
 
 
-
 #define ENCRYPT    (1 << 0)
 #define SIGN       (1 << 1)
 #define GOODSIGN   (1 << 2)
@@ -90,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. */
@@ -113,24 +115,12 @@ void crypt_forget_passphrase (void);
 /* Check that we have a usable passphrase, ask if not. */
 int crypt_valid_passphrase (int);
 
-/* Write the message body/part A described by state S to a the given
-   TEMPFILE.  */
-int crypt_write_signed (BODY * a, STATE * s, const char *tempf);
-
-
 
 /*-- cryptglue.c --*/
 
 /* Show a message that a backend will be invoked. */
 void crypt_invoke_message (int type);
 
-
-/* Silently forget about a passphrase. */
-void crypt_pgp_void_passphrase (void);
-
-int crypt_pgp_valid_passphrase (void);
-
-
 /* Decrypt a PGP/MIME message. */
 int crypt_pgp_decrypt_mime (FILE * a, FILE ** b, BODY * c, BODY ** d);
 
@@ -150,9 +140,6 @@ pgp_key_t crypt_pgp_ask_for_key (char *tag, char *whatfor,
 /* Check for a traditional PGP message in body B. */
 int crypt_pgp_check_traditional (FILE * fp, BODY * b, int tagged_only);
 
-/* fixme: needs documentation. */
-BODY *crypt_pgp_traditional_encryptsign (BODY * a, int flags, char *keylist);
-
 /* Release the PGP key KPP (note, that we pass a pointer to it). */
 void crypt_pgp_free_key (pgp_key_t * kpp);
 
@@ -170,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);
 
@@ -186,14 +168,6 @@ void crypt_pgp_extract_keys_from_attachment_list (FILE * fp, int tag,
                                                   BODY * top);
 
 
-
-
-
-/* Silently forget about a passphrase. */
-void crypt_smime_void_passphrase (void);
-
-int crypt_smime_valid_passphrase (void);
-
 /* Decrypt an S/MIME message. */
 int crypt_smime_decrypt_mime (FILE * a, FILE ** b, BODY * c, BODY ** d);
 
@@ -219,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 (char *infile, char *mailbox);
-
-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 */