1 files changed, 7 insertions, 22 deletions

diff --git a/src/lib/libssl/src/crypto/md2/md2.org b/src/lib/libcrypto/md2/md2.h
index 9f39933790..0d3592506c 100644
--- a/src/lib/libssl/src/crypto/md2/md2.org
+++ b/src/lib/libcrypto/md2/md2.h
@@ -1,4 +1,4 @@
-/* crypto/md/md2.org */
+/* crypto/md/md2.h */
 /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -56,15 +56,6 @@
  * [including the GNU Public Licence.]
  */
 
-/* WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
- *
- * Always modify md2.org since md2.h is automatically generated from 
- * it during SSLeay configuration.
- *
- * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
- */
-
-
 #ifndef HEADER_MD2_H
 #define HEADER_MD2_H
 
@@ -72,10 +63,13 @@
 extern "C" {
 #endif
 
+#ifdef NO_MD2
+#error MD2 is disabled.
+#endif
+
 #define MD2_DIGEST_LENGTH       16
 #define MD2_BLOCK               16
-
-#define MD2_INT unsigned int
+#include <openssl/opensslconf.h> /* MD2_INT */
 
 typedef struct MD2state_st
         {
@@ -85,20 +79,11 @@ typedef struct MD2state_st
         MD2_INT state[MD2_BLOCK];
         } MD2_CTX;
 
-#ifndef NOPROTO
-char *MD2_options(void);
+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
-char *MD2_options();
-void MD2_Init();
-void MD2_Update();
-void MD2_Final();
-unsigned char *MD2();
-#endif
-
 #ifdef  __cplusplus
 }
 #endif