e_os.h does not belong with the exported headers. Do not put it there

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

diff --git a/crypto/des/des.h b/crypto/des/des.h
index cf536e642895ca6bec0f320cebea51b94788cf59..5fa6aef27b11e645bf170cf88af940f41a4c6a38 100644 (file)
--- a/crypto/des/des.h
+++ b/crypto/des/des.h
@@ -59,7 +59,7 @@
 #ifndef HEADER_DES_H
 #define HEADER_DES_H
 
-#ifdef NO_DES
+#ifdef OPENSSL_NO_DES
 #error DES is disabled.
 #endif
 
@@ -67,10 +67,14 @@
 #error <openssl/des.h> replaces <kerberos/des.h>.
 #endif
 
-#include <stdio.h>
 #include <openssl/opensslconf.h> /* DES_LONG */
 #include <openssl/e_os2.h>     /* OPENSSL_EXTERN */
 
+#ifdef OPENSSL_BUILD_SHLIBCRYPTO
+# undef OPENSSL_EXTERN
+# define OPENSSL_EXTERN OPENSSL_EXPORT
+#endif
+
 #ifdef  __cplusplus
 extern "C" {
 #endif
@@ -114,7 +118,6 @@ typedef struct des_ks_struct
 
 OPENSSL_EXTERN int des_check_key;      /* defaults to false */
 OPENSSL_EXTERN int des_rw_mode;                /* defaults to DES_PCBC_MODE */
-OPENSSL_EXTERN int des_set_weak_key_flag; /* set the weak key flag */
 
 const char *des_options(void);
 void des_ecb3_encrypt(const_des_cblock *input, des_cblock *output,