merge crypt back into $top_builddir :)

[apps/madmutt.git] / crypt.h

diff --git a/lib-crypt/crypt.h b/crypt.h
similarity index 91%
rename from lib-crypt/crypt.h
rename to crypt.h
index 8d394ca..12acc61 100644 (file)
--- a/lib-crypt/crypt.h
+++ b/crypt.h
@@ -19,10 +19,6 @@
 #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)
@@ -39,14 +35,11 @@
 
 #define PGPENCRYPT  (APPLICATION_PGP | ENCRYPT)
 #define PGPSIGN     (APPLICATION_PGP | SIGN)
-#define PGPGOODSIGN (APPLICATION_PGP | GOODSIGN)
 #define PGPKEY      (APPLICATION_PGP | KEYBLOCK)
 #define PGPINLINE   (APPLICATION_PGP | INLINE)
 
 #define SMIMEENCRYPT  (APPLICATION_SMIME | ENCRYPT)
 #define SMIMESIGN     (APPLICATION_SMIME | SIGN)
-#define SMIMEGOODSIGN (APPLICATION_SMIME | GOODSIGN)
-#define SMIMEBADSIGN  (APPLICATION_SMIME | BADSIGN)
 #define SMIMEOPAQUE   (APPLICATION_SMIME | SIGNOPAQUE)
 
 #define KEYFLAG_CANSIGN                (1 <<  0)
@@ -66,29 +59,6 @@
 
 #define KEYFLAG_ABILITIES (KEYFLAG_CANSIGN|KEYFLAG_CANENCRYPT|KEYFLAG_PREFER_ENCRYPTION|KEYFLAG_PREFER_SIGNING)
 
-enum pgp_ring {
-  PGP_PUBRING,
-  PGP_SECRING
-};
-typedef enum pgp_ring pgp_ring_t;
-
-
-struct pgp_keyinfo;
-typedef struct pgp_keyinfo *pgp_key_t;
-
-
-
-/* Some prototypes -- old crypt.h. */
-
-int mutt_protect (HEADER *, char *);
-
-int mutt_signed_handler (BODY *, STATE *);
-
-int mutt_parse_crypt_hdr (char *, int);
-
-void convert_to_7bit (BODY *);
-
-
 /*-- new API --*/
 
 void crypt_invoke_import(FILE *stream, int smime);
@@ -98,6 +68,11 @@ 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 *);
+
 /* Check out the type of encryption used and set the cached status
    values if there are any. */
 int crypt_query (BODY * m);