Make sure we get the definition of OPENSSL_EXTERN, OPENSSL_NO_DES,

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

diff --git a/crypto/des/des.h b/crypto/des/des.h
index 68fd355c79f8e284c4402f42b0355ade4f83106a..4475143db55d8041c3154722dda355da2cb7865e 100644 (file)
--- a/crypto/des/des.h
+++ b/crypto/des/des.h
@@ -56,16 +56,16 @@
  * [including the GNU Public Licence.]
  */
 
-#ifndef HEADER_DES_H
-#define HEADER_DES_H
+#ifndef HEADER_NEW_DES_H
+#define HEADER_NEW_DES_H
+
+#include <openssl/e_os2.h>     /* OPENSSL_EXTERN, OPENSSL_NO_DES,
+                                  DES_LONG (via openssl/opensslconf.h */
 
 #ifdef OPENSSL_NO_DES
 #error DES is disabled.
 #endif
 
-#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
@@ -91,6 +91,16 @@ typedef struct DES_ks
        } ks[16];
     } DES_key_schedule;
 
+#ifndef OPENSSL_DISABLE_OLD_DES_SUPPORT
+# ifndef OPENSSL_ENABLE_OLD_DES_SUPPORT
+#  define OPENSSL_ENABLE_OLD_DES_SUPPORT
+# endif
+#endif
+
+#ifdef OPENSSL_ENABLE_OLD_DES_SUPPORT
+# include <openssl/des_old.h>
+#endif
+
 #define DES_KEY_SZ     (sizeof(DES_cblock))
 #define DES_SCHEDULE_SZ (sizeof(DES_key_schedule))
 
@@ -198,7 +208,6 @@ void DES_pcbc_encrypt(const unsigned char *input,unsigned char *output,
                      int enc);
 DES_LONG DES_quad_cksum(const unsigned char *input,DES_cblock output[],
                        long length,int out_count,DES_cblock *seed);
-void DES_random_seed(DES_cblock *key);
 int DES_random_key(DES_cblock *ret);
 void DES_set_odd_parity(DES_cblock *key);
 int DES_check_key_parity(const_DES_cblock *key);
@@ -218,6 +227,10 @@ void DES_cfb64_encrypt(const unsigned char *in,unsigned char *out,long length,
 void DES_ofb64_encrypt(const unsigned char *in,unsigned char *out,long length,
                       DES_key_schedule *schedule,DES_cblock *ivec,int *num);
 
+int DES_read_password(DES_cblock *key, const char *prompt, int verify);
+int DES_read_2passwords(DES_cblock *key1, DES_cblock *key2, const char *prompt,
+       int verify);
+
 #define DES_fixup_key_parity DES_set_odd_parity
 
 #ifdef  __cplusplus