always build pgp support.

[apps/madmutt.git] / mutt_crypt.h

diff --git a/mutt_crypt.h b/mutt_crypt.h
index 3d39aab..19b28c6 100644 (file)
--- a/mutt_crypt.h
+++ b/mutt_crypt.h
@@ -16,7 +16,7 @@
 #ifndef MUTT_CRYPT_H
 #define MUTT_CRYPT_H
 
-#include "mutt.h"               /* Need this to declare BODY, ADDRESS. STATE etc. */
+#include "mutt.h"               /* Need this to declare BODY, address_t. STATE etc. */
 #include "state.h"
 
 /* FIXME: They should be pointer to anonymous structures for better
@@ -57,14 +57,10 @@
    effectively as a conditional compile directive. It is set to false
    if no crypto backend is configures or to a bit vector denoting the
    configured backends. */
-#if (defined(CRYPT_BACKEND_CLASSIC_PGP) && defined(CRYPT_BACKEND_CLASSIC_SMIME)) || defined (CRYPT_BACKEND_GPGME)
+#if defined(CRYPT_BACKEND_CLASSIC_SMIME) || defined (CRYPT_BACKEND_GPGME)
 # define WithCrypto (APPLICATION_PGP | APPLICATION_SMIME)
-#elif defined(CRYPT_BACKEND_CLASSIC_PGP)
-# define WithCrypto  APPLICATION_PGP
-#elif defined(CRYPT_BACKEND_CLASSIC_SMIME)
-# define WithCrypto  APPLICATION_SMIME
 #else
-# define WithCrypto 0
+# define WithCrypto  APPLICATION_PGP
 #endif
 
 
@@ -121,7 +117,7 @@ void convert_to_7bit (BODY *);
 /*-- crypt.c --*/
 
 /* Print the current time. */
-void crypt_current_time (STATE * s, char *app_name);
+void crypt_current_time (STATE * s, const char *app_name);
 
 /* Check out the type of encryption used and set the cached status
    values if there are any. */
@@ -169,7 +165,7 @@ int crypt_pgp_application_pgp_handler (BODY * m, STATE * s);
 int crypt_pgp_encrypted_handler (BODY * a, STATE * s);
 
 /* fixme: needs documentation. */
-void crypt_pgp_invoke_getkeys (ADDRESS * addr);
+void crypt_pgp_invoke_getkeys (address_t * addr);
 
 /* Ask for a PGP key. */
 pgp_key_t crypt_pgp_ask_for_key (char *tag, char *whatfor,
@@ -189,7 +185,7 @@ BODY *crypt_pgp_make_key_attachment (char *tempf);
 
 /* This routine attempts to find the keyids of the recipients of a
    message.  It returns NULL if any of the keys can not be found.  */
-char *crypt_pgp_findkeys (ADDRESS * to, ADDRESS * cc, ADDRESS * bcc);
+char *crypt_pgp_findkeys (address_t * to, address_t * cc, address_t * bcc);
 
 /* Create a new body with a PGP signed message from A. */
 BODY *crypt_pgp_sign_message (BODY * a);
@@ -239,7 +235,7 @@ char *crypt_smime_ask_for_key (char *prompt, char *mailbox, short public);
 
 /* This routine attempts to find the keyids of the recipients of a
    message.  It returns NULL if any of the keys can not be found.  */
-char *crypt_smime_findkeys (ADDRESS * to, ADDRESS * cc, ADDRESS * bcc);
+char *crypt_smime_findkeys (address_t * to, address_t * cc, address_t * bcc);
 
 /* fixme: Needs documentation. */
 BODY *crypt_smime_sign_message (BODY * a);