3 files changed, 22 insertions, 5 deletions
diff --git a/include/cipher.h b/include/cipher.h
index e3280428f..e8bbbd490 100644
--- a/include/cipher.h
+++ b/include/cipher.h
@@ -49,11 +49,11 @@
 #define CIPHER_ALGO_BLOWFISH	42  /* blowfish 160 bit key (not in OpenPGP)*/
 #define CIPHER_ALGO_GOST	43  /* (Not in OpenPGP) */
 
-#define PUBKEY_ALGO_RSA       1
-#define PUBKEY_ALGO_RSA_E     2     /* RSA encrypt only */
-#define PUBKEY_ALGO_RSA_S     3     /* RSA sign only */
-#define PUBKEY_ALGO_ELGAMAL  16
-#define PUBKEY_ALGO_DSA      17
+#define PUBKEY_ALGO_RSA        1
+#define PUBKEY_ALGO_RSA_E      2     /* RSA encrypt only */
+#define PUBKEY_ALGO_RSA_S      3     /* RSA sign only */
+#define PUBKEY_ALGO_ELGAMAL   16
+#define PUBKEY_ALGO_DSA       17
 
 #define DIGEST_ALGO_MD5       1
 #define DIGEST_ALGO_SHA1      2
@@ -72,11 +72,26 @@ typedef struct {
       MD5HANDLE md5;
       RMDHANDLE rmd;
     } u;
+    int datalen;
+    char data[1];
 } MD_HANDLE;
 
 
 int cipher_debug_mode;
 
+/*-- md.c --*/
+int md_okay( int algo );
+MD_HANDLE *md_open( int algo, int secure );
+MD_HANDLE *md_copy( MD_HANDLE *a );
+MD_HANDLE *md_makecontainer( int algo ); /* used for a bad kludge */
+void md_write( MD_HANDLE *a, byte *inbuf, size_t inlen);
+void md_putchar( MD_HANDLE *a, int c );
+byte *md_final(MD_HANDLE *a);
+void md_close(MD_HANDLE *a);
+
+MD_HANDLE *md5_copy2md( MD5HANDLE a ); /* (in md5.c) */
+MD_HANDLE *rmd160_copy2md( RMDHANDLE a ); /* (in rmd160.c) */
+
 /*-- random.c --*/
 void randomize_buffer( byte *buffer, size_t length, int level );
 byte get_random_byte( int level );
diff --git a/include/errors.h b/include/errors.h
index f2e7570cc..7ad3181c4 100644
--- a/include/errors.h
+++ b/include/errors.h
@@ -48,5 +48,6 @@
 #define G10ERR_PASSPHRASE     26 /* invalid passphrase */
 #define G10ERR_NI_PUBKEY      27
 #define G10ERR_NI_CIPHER      28
+#define G10ERR_SIG_CLASS      29
 
 #endif /*G10_ERRORS_H*/
diff --git a/include/util.h b/include/util.h
index f71275cb9..0b6d4e9bc 100644
--- a/include/util.h
+++ b/include/util.h
@@ -82,6 +82,7 @@ const char *strusage( int level );
 
 /*-- miscutil.c --*/
 u32 make_timestamp(void);
+void print_string( FILE *fp, byte *p, size_t n );
 
 /*-- strgutil.c --*/
 void free_strlist( STRLIST sl );