Simplifications.

[apps/madmutt.git] / crypt.h

diff --git a/crypt.h b/crypt.h
index 12acc61..0251623 100644 (file)
--- a/crypt.h
+++ b/crypt.h
@@ -18,6 +18,7 @@
 
 #include <lib-mime/mime.h>
 #include "state.h"
+#include "crypt.li"
 
 #define ENCRYPT    (1 << 0)
 #define SIGN       (1 << 1)
@@ -59,19 +60,11 @@
 
 #define KEYFLAG_ABILITIES (KEYFLAG_CANSIGN|KEYFLAG_CANENCRYPT|KEYFLAG_PREFER_ENCRYPTION|KEYFLAG_PREFER_SIGNING)
 
-/*-- new API --*/
-
-void crypt_invoke_import(FILE *stream, int smime);
 int crypt_send_menu(HEADER *msg, int *redraw, int smime);
-int crypt_verify_one(BODY *, STATE *s, FILE *fp, int smime);
-
-
-/*-- crypt.c --*/
-
 int mutt_protect (HEADER *, char *);
 int mutt_signed_handler (BODY *, STATE *);
 int mutt_parse_crypt_hdr (char *, int);
-void convert_to_7bit (BODY *);
+int mutt_check_traditional_pgp (HEADER *, int *);
 
 /* Check out the type of encryption used and set the cached status
    values if there are any. */
@@ -85,10 +78,6 @@ void crypt_extract_keys_from_messages (HEADER * h);
    Return the list of keys in KEYLIST. */
 int crypt_get_keys (HEADER * msg, char **keylist);
 
-
-/* Show a message that a backend will be invoked. */
-void crypt_invoke_message (int type);
-
 /* Decrypt a PGP/MIME message. */
 int crypt_pgp_decrypt_mime (FILE * a, FILE ** b, BODY * c, BODY ** d);
 
@@ -98,22 +87,9 @@ int crypt_pgp_application_pgp_handler (BODY * m, STATE * s);
 /* MIME handler for an PGP/MIME encrypted message. */
 int crypt_pgp_encrypted_handler (BODY * a, STATE * s);
 
-/* fixme: needs documentation. */
-void crypt_pgp_invoke_getkeys (address_t * addr);
-
 /* Check for a traditional PGP message in body B. */
 int crypt_pgp_check_traditional (FILE * fp, BODY * b, int tagged_only);
 
-/* Generate a PGP public key attachment. */
-BODY *crypt_pgp_make_key_attachment (char *tempf);
-
-/* Create a new body with a PGP signed message from A. */
-BODY *crypt_pgp_sign_message (BODY * a);
-
-/* Warning: A is no longer freed in this routine, you need to free it
-   later.  This is necessary for $fcc_attach. */
-BODY *crypt_pgp_encrypt_message (BODY * a, char *keylist, int sign);
-
 /* fixme: needs documentation */
 void crypt_pgp_extract_keys_from_attachment_list (FILE * fp, int tag,
                                                   BODY * top);
@@ -125,16 +101,7 @@ int crypt_smime_decrypt_mime (FILE * a, FILE ** b, BODY * c, BODY ** d);
 /* MIME handler for the application/smime content-type. */
 int crypt_smime_application_smime_handler (BODY * m, STATE * s);
 
-/* fixme: Needs documentation. */
-void crypt_smime_getkeys (ENVELOPE * env);
-
 /* Check that the sender matches. */
 int crypt_smime_verify_sender (HEADER * h);
 
-/* fixme: Needs documentation. */
-BODY *crypt_smime_sign_message (BODY * a);
-
-/* fixme: needs documentation. */
-BODY *crypt_smime_build_smime_entity (BODY * a, char *certlist);
-
 #endif /*MUTT_CRYPT_H */