Experimental symbol renaming to avoid clashes with regular OpenSSL.

Make sure crypto.h is included first in any affected files.

11 files changed, 12 insertions, 1 deletions

diff --git a/crypto/des/cfb64ede.c b/crypto/des/cfb64ede.c
index de34ecceb9..40da95888c 100644
--- a/crypto/des/cfb64ede.c
+++ b/crypto/des/cfb64ede.c
@@ -56,6 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
+#include <openssl/crypto.h>
 #include "des_locl.h"
 #include "e_os.h"
 
diff --git a/crypto/des/cfb64enc.c b/crypto/des/cfb64enc.c
index 5ec8683e40..45fa518936 100644
--- a/crypto/des/cfb64enc.c
+++ b/crypto/des/cfb64enc.c
@@ -56,6 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
+#include <openssl/crypto.h>
 #include "des_locl.h"
 
 /* The input and output encrypted as though 64bit cfb mode is being
diff --git a/crypto/des/cfb_enc.c b/crypto/des/cfb_enc.c
index 720f29a28e..d8c195e1d6 100644
--- a/crypto/des/cfb_enc.c
+++ b/crypto/des/cfb_enc.c
@@ -57,6 +57,7 @@
  */
 
 #include "e_os.h"
+#include <openssl/crypto.h>
 #include "des_locl.h"
 #include <assert.h>
 
diff --git a/crypto/des/des_enc.c b/crypto/des/des_enc.c
index 828feba208..efe35aa3c5 100644
--- a/crypto/des/des_enc.c
+++ b/crypto/des/des_enc.c
@@ -56,6 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
+#include <openssl/crypto.h>
 #include "des_locl.h"
 #include "spr.h"
 
diff --git a/crypto/des/ecb3_enc.c b/crypto/des/ecb3_enc.c
index c3437bc606..420c5d13f4 100644
--- a/crypto/des/ecb3_enc.c
+++ b/crypto/des/ecb3_enc.c
@@ -56,6 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
+#include <openssl/crypto.h>
 #include "des_locl.h"
 
 void DES_ecb3_encrypt(const_DES_cblock *input, DES_cblock *output,
diff --git a/crypto/des/ecb_enc.c b/crypto/des/ecb_enc.c
index 0684e769b3..de4ede1a7b 100644
--- a/crypto/des/ecb_enc.c
+++ b/crypto/des/ecb_enc.c
@@ -56,6 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
+#include <openssl/crypto.h>
 #include "des_locl.h"
 #include "des_ver.h"
 #include <openssl/opensslv.h>
diff --git a/crypto/des/fcrypt.c b/crypto/des/fcrypt.c
index ccbdff250f..04f95fa5b0 100644
--- a/crypto/des/fcrypt.c
+++ b/crypto/des/fcrypt.c
@@ -9,6 +9,8 @@
 #include <openssl/ebcdic.h>
 #endif
 
+#include <openssl/crypto.h>
+
 /* This version of crypt has been developed from my MIT compatible
  * DES library.
  * Eric Young (eay@cryptsoft.com)
diff --git a/crypto/des/fcrypt_b.c b/crypto/des/fcrypt_b.c
index 8822816938..18d7ffc18c 100644
--- a/crypto/des/fcrypt_b.c
+++ b/crypto/des/fcrypt_b.c
@@ -57,6 +57,7 @@
  */
 
 #include <stdio.h>
+#include <openssl/crypto.h>
 
 /* This version of crypt has been developed from my MIT compatible
  * DES library.
diff --git a/crypto/des/ofb64ede.c b/crypto/des/ofb64ede.c
index 26bbf9a6a7..089407b69f 100644
--- a/crypto/des/ofb64ede.c
+++ b/crypto/des/ofb64ede.c
@@ -56,6 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
+#include <openssl/crypto.h>
 #include "des_locl.h"
 
 /* The input and output encrypted as though 64bit ofb mode is being
diff --git a/crypto/des/set_key.c b/crypto/des/set_key.c
index 3004cc3ab3..ce4faf2322 100644
--- a/crypto/des/set_key.c
+++ b/crypto/des/set_key.c
@@ -63,6 +63,7 @@
  * 1.1 added norm_expand_bits
  * 1.0 First working version
  */
+#include <openssl/crypto.h>
 #include "des_locl.h"
 
 OPENSSL_IMPLEMENT_GLOBAL(int,DES_check_key,0)	/* defaults to false */
diff --git a/crypto/des/str2key.c b/crypto/des/str2key.c
index 9c2054bda6..1077f99d1b 100644
--- a/crypto/des/str2key.c
+++ b/crypto/des/str2key.c
@@ -56,8 +56,8 @@
  * [including the GNU Public Licence.]
  */
 
-#include "des_locl.h"
 #include <openssl/crypto.h>
+#include "des_locl.h"
 
 void DES_string_to_key(const char *str, DES_cblock *key)
 	{