aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/des/des.h
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2002-03-26 13:59:22 +0000
committerRichard Levitte <levitte@openssl.org>2002-03-26 13:59:22 +0000
commit401cd0af0f0bb97912a7f0f90c96e8e73fcb4681 (patch)
tree5004d5ae91fdf8abfb0279bca4862048a6daa013 /crypto/des/des.h
parentc7b41e67f0d7cccb4a88c7f19b76043f96232eee (diff)
downloadopenssl-401cd0af0f0bb97912a7f0f90c96e8e73fcb4681.tar.gz
Add the mapping of des_random_seed() for 0.9.6 compatibility.
Make sure DES_cblock is defined at all times (meaning one shouldn't include openssl/des_old.h directly any more).
Diffstat (limited to 'crypto/des/des.h')
-rw-r--r--crypto/des/des.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/des/des.h b/crypto/des/des.h
index 6e4cdbd904..a36a8e68a4 100644
--- a/crypto/des/des.h
+++ b/crypto/des/des.h
@@ -66,10 +66,6 @@
#include <openssl/opensslconf.h> /* DES_LONG */
#include <openssl/e_os2.h> /* OPENSSL_EXTERN */
-#ifndef OPENSSL_DISABLE_OLD_DES_SUPPORT
-# include <openssl/des_old.h>
-#endif
-
#ifdef OPENSSL_BUILD_SHLIBCRYPTO
# undef OPENSSL_EXTERN
# define OPENSSL_EXTERN OPENSSL_EXPORT
@@ -95,6 +91,10 @@ typedef struct DES_ks
} ks[16];
} DES_key_schedule;
+#ifndef OPENSSL_DISABLE_OLD_DES_SUPPORT
+# include <openssl/des_old.h>
+#endif
+
#define DES_KEY_SZ (sizeof(DES_cblock))
#define DES_SCHEDULE_SZ (sizeof(DES_key_schedule))