Improve error handling if decompression of an ec point fails, and cleanup

[openssl.git] / crypto / md2 / md2.h

diff --git a/crypto/md2/md2.h b/crypto/md2/md2.h
index 122e276d57c0a70ac0cfc37b20e184d075446697..45bf4cc29c84ed07b29a209dec14bf326bd2467f 100644 (file)
--- a/crypto/md2/md2.h
+++ b/crypto/md2/md2.h
@@ -59,13 +59,17 @@
 #ifndef HEADER_MD2_H
 #define HEADER_MD2_H
 
-#ifdef  __cplusplus
-extern "C" {
+#include <openssl/opensslconf.h> /* OPENSSL_NO_MD2, MD2_INT */
+#ifdef OPENSSL_NO_MD2
+#error MD2 is disabled.
 #endif
 
 #define MD2_DIGEST_LENGTH      16
 #define MD2_BLOCK              16
-#include "opensslconf.h" /* MD2_INT */
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
 
 typedef struct MD2state_st
        {
@@ -75,20 +79,11 @@ typedef struct MD2state_st
        MD2_INT state[MD2_BLOCK];
        } MD2_CTX;
 
-#ifndef NOPROTO
 const char *MD2_options(void);
-void MD2_Init(MD2_CTX *c);
-void MD2_Update(MD2_CTX *c, register unsigned char *data, unsigned long len);
-void MD2_Final(unsigned char *md, MD2_CTX *c);
-unsigned char *MD2(unsigned char *d, unsigned long n,unsigned char *md);
-#else
-const char *MD2_options();
-void MD2_Init();
-void MD2_Update();
-void MD2_Final();
-unsigned char *MD2();
-#endif
-
+int MD2_Init(MD2_CTX *c);
+int MD2_Update(MD2_CTX *c, const unsigned char *data, size_t len);
+int MD2_Final(unsigned char *md, MD2_CTX *c);
+unsigned char *MD2(const unsigned char *d, size_t n,unsigned char *md);
 #ifdef  __cplusplus
 }
 #endif