OpenSSL 0.9.4 merge

1 files changed, 5 insertions, 11 deletions

diff --git a/src/lib/libcrypto/mdc2/mdc2.h b/src/lib/libcrypto/mdc2/mdc2.h
index 0b104be184..ec8e159fc9 100644
--- a/src/lib/libcrypto/mdc2/mdc2.h
+++ b/src/lib/libcrypto/mdc2/mdc2.h
@@ -63,7 +63,11 @@
 extern "C" {
 #endif
 
-#include "des.h"
+#include <openssl/des.h>
+
+#ifdef NO_MDC2
+#error MDC2 is disabled.
+#endif
 
 #define MDC2_BLOCK              8
 #define MDC2_DIGEST_LENGTH      16
@@ -76,22 +80,12 @@ typedef struct mdc2_ctx_st
         int pad_type; /* either 1 or 2, default 1 */
         } MDC2_CTX;
 
-#ifndef NOPROTO
 
 void MDC2_Init(MDC2_CTX *c);
 void MDC2_Update(MDC2_CTX *c, unsigned char *data, unsigned long len);
 void MDC2_Final(unsigned char *md, MDC2_CTX *c);
 unsigned char *MDC2(unsigned char *d, unsigned long n, unsigned char *md);
 
-#else
-
-void MDC2_Init();
-void MDC2_Update();
-void MDC2_Final();
-unsigned char *MDC2();
-
-#endif
-
 #ifdef  __cplusplus
 }
 #endif