summaryrefslogtreecommitdiffstats
path: root/crypto/openssl/crypto/des/des_old.h
diff options
context:
space:
mode:
Diffstat (limited to 'crypto/openssl/crypto/des/des_old.h')
-rw-r--r--crypto/openssl/crypto/des/des_old.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/crypto/openssl/crypto/des/des_old.h b/crypto/openssl/crypto/des/des_old.h
index 1d840b4..1b0620c 100644
--- a/crypto/openssl/crypto/des/des_old.h
+++ b/crypto/openssl/crypto/des/des_old.h
@@ -91,6 +91,8 @@
#ifndef HEADER_DES_H
#define HEADER_DES_H
+#include <openssl/e_os2.h> /* OPENSSL_EXTERN, OPENSSL_NO_DES, DES_LONG */
+
#ifdef OPENSSL_NO_DES
#error DES is disabled.
#endif
@@ -103,8 +105,6 @@
#error <openssl/des_old.h> replaces <kerberos/des.h>.
#endif
-#include <openssl/opensslconf.h> /* DES_LONG */
-#include <openssl/e_os2.h> /* OPENSSL_EXTERN */
#include <openssl/symhacks.h>
#ifdef OPENSSL_BUILD_SHLIBCRYPTO
@@ -116,6 +116,10 @@
extern "C" {
#endif
+#ifdef _
+#undef _
+#endif
+
typedef unsigned char _ossl_old_des_cblock[8];
typedef struct _ossl_old_des_ks_struct
{
@@ -171,9 +175,9 @@ typedef struct _ossl_old_des_ks_struct
DES_enc_write((f),(b),(l),&(k),(iv))
#define des_fcrypt(b,s,r)\
DES_fcrypt((b),(s),(r))
+#if 0
#define des_crypt(b,s)\
DES_crypt((b),(s))
-#if 0
#if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__)
#define crypt(b,s)\
DES_crypt((b),(s))
OpenPOWER on IntegriCloud