Include openssl/crypto.h first in several other files so FIPS renaming

is picked up.

21 files changed, 21 insertions, 0 deletions

diff --git a/crypto/camellia/cmll_cbc.c b/crypto/camellia/cmll_cbc.c
index 4c8d455ade..158daea704 100644
--- a/crypto/camellia/cmll_cbc.c
+++ b/crypto/camellia/cmll_cbc.c
@@ -49,6 +49,7 @@
  *
  */
 
+#include <openssl/crypto.h>
 #include <openssl/camellia.h>
 #include <openssl/modes.h>
 
diff --git a/crypto/camellia/cmll_cfb.c b/crypto/camellia/cmll_cfb.c
index 3d81b51d3f..97cc0e7201 100644
--- a/crypto/camellia/cmll_cfb.c
+++ b/crypto/camellia/cmll_cfb.c
@@ -105,6 +105,7 @@
  * [including the GNU Public Licence.]
  */
 
+#include <openssl/crypto.h>
 #include <openssl/camellia.h>
 #include <openssl/modes.h>
 
diff --git a/crypto/camellia/cmll_ctr.c b/crypto/camellia/cmll_ctr.c
index 014e621a34..6d993bd204 100644
--- a/crypto/camellia/cmll_ctr.c
+++ b/crypto/camellia/cmll_ctr.c
@@ -49,6 +49,7 @@
  *
  */
 
+#include <openssl/crypto.h>
 #include <openssl/camellia.h>
 #include <openssl/modes.h>
 
diff --git a/crypto/camellia/cmll_ofb.c b/crypto/camellia/cmll_ofb.c
index a482befc74..4f5644f7a5 100644
--- a/crypto/camellia/cmll_ofb.c
+++ b/crypto/camellia/cmll_ofb.c
@@ -105,6 +105,7 @@
  * [including the GNU Public Licence.]
  */
 
+#include <openssl/crypto.h>
 #include <openssl/camellia.h>
 #include <openssl/modes.h>
 
diff --git a/crypto/des/cbc_cksm.c b/crypto/des/cbc_cksm.c
index 09a7ba56aa..8413c81b6b 100644
--- a/crypto/des/cbc_cksm.c
+++ b/crypto/des/cbc_cksm.c
@@ -56,6 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
+#include <openssl/crypto.h>
 #include "des_locl.h"
 
 DES_LONG DES_cbc_cksum(const unsigned char *in, DES_cblock *output,
diff --git a/crypto/des/des_old.c b/crypto/des/des_old.c
index 7c33ed7a93..4102652100 100644
--- a/crypto/des/des_old.c
+++ b/crypto/des/des_old.c
@@ -73,6 +73,7 @@
  */
 
 #define OPENSSL_DES_LIBDES_COMPATIBILITY
+#include <openssl/crypto.h>
 #include <openssl/des.h>
 #include <openssl/rand.h>
 
diff --git a/crypto/des/des_old2.c b/crypto/des/des_old2.c
index c8fa3ee135..4615f25388 100644
--- a/crypto/des/des_old2.c
+++ b/crypto/des/des_old2.c
@@ -73,6 +73,7 @@
  */
 
 #undef OPENSSL_DES_LIBDES_COMPATIBILITY
+#include <openssl/crypto.h>
 #include <openssl/des.h>
 #include <openssl/rand.h>
 
diff --git a/crypto/des/destest.c b/crypto/des/destest.c
index 64b92a34fe..9d02b90811 100644
--- a/crypto/des/destest.c
+++ b/crypto/des/destest.c
@@ -59,6 +59,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <openssl/crypto.h>
 #include <openssl/e_os2.h>
 #if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16) || defined(OPENSSL_SYS_WINDOWS)
 #ifndef OPENSSL_SYS_MSDOS
diff --git a/crypto/des/ede_cbcm_enc.c b/crypto/des/ede_cbcm_enc.c
index adfcb75cf3..57548af8b2 100644
--- a/crypto/des/ede_cbcm_enc.c
+++ b/crypto/des/ede_cbcm_enc.c
@@ -68,6 +68,7 @@ http://www.cs.technion.ac.il/users/wwwb/cgi-bin/tr-get.cgi/1998/CS/CS0928.ps.gz
 
 */
 
+#include <openssl/crypto.h>
 #include <openssl/opensslconf.h> /* To see if OPENSSL_NO_DESCBCM is defined */
 
 #ifndef OPENSSL_NO_DESCBCM
diff --git a/crypto/des/ncbc_enc.c b/crypto/des/ncbc_enc.c
index fda23d522f..dc3dff1431 100644
--- a/crypto/des/ncbc_enc.c
+++ b/crypto/des/ncbc_enc.c
@@ -61,6 +61,7 @@
  * [including the GNU Public Licence.]
  */
 
+#include <openssl/crypto.h>
 #include "des_locl.h"
 
 #ifdef CBC_ENC_C__DONT_UPDATE_IV
diff --git a/crypto/des/ofb64enc.c b/crypto/des/ofb64enc.c
index 8ca3d49dea..368c6ad04f 100644
--- a/crypto/des/ofb64enc.c
+++ b/crypto/des/ofb64enc.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/ofb_enc.c b/crypto/des/ofb_enc.c
index e887a3c6f4..8ce7aba5c6 100644
--- a/crypto/des/ofb_enc.c
+++ b/crypto/des/ofb_enc.c
@@ -56,6 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
+#include <openssl/crypto.h>
 #include "des_locl.h"
 
 /* The input and output are loaded in multiples of 8 bits.
diff --git a/crypto/des/pcbc_enc.c b/crypto/des/pcbc_enc.c
index 17a40f9520..7760e34fa6 100644
--- a/crypto/des/pcbc_enc.c
+++ b/crypto/des/pcbc_enc.c
@@ -56,6 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
+#include <openssl/crypto.h>
 #include "des_locl.h"
 
 void DES_pcbc_encrypt(const unsigned char *input, unsigned char *output,
diff --git a/crypto/des/rand_key.c b/crypto/des/rand_key.c
index 2398165568..6811c04ac3 100644
--- a/crypto/des/rand_key.c
+++ b/crypto/des/rand_key.c
@@ -53,6 +53,7 @@
  *
  */
 
+#include <openssl/crypto.h>
 #include <openssl/des.h>
 #include <openssl/rand.h>
 
diff --git a/crypto/des/rpc_enc.c b/crypto/des/rpc_enc.c
index d937d08da5..5e88c55c99 100644
--- a/crypto/des/rpc_enc.c
+++ b/crypto/des/rpc_enc.c
@@ -56,6 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
+#include <openssl/crypto.h>
 #include "rpc_des.h"
 #include "des_locl.h"
 #include "des_ver.h"
diff --git a/crypto/des/xcbc_enc.c b/crypto/des/xcbc_enc.c
index 058cab6bce..6a66951733 100644
--- a/crypto/des/xcbc_enc.c
+++ b/crypto/des/xcbc_enc.c
@@ -56,6 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
+#include <openssl/crypto.h>
 #include "des_locl.h"
 
 /* RSA's DESX */
diff --git a/crypto/engine/enginetest.c b/crypto/engine/enginetest.c
index f4d70e7e0a..857403ddf9 100644
--- a/crypto/engine/enginetest.c
+++ b/crypto/engine/enginetest.c
@@ -58,6 +58,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <openssl/crypto.h>
 #include <openssl/e_os2.h>
 
 #ifdef OPENSSL_NO_ENGINE
diff --git a/crypto/mdc2/mdc2dgst.c b/crypto/mdc2/mdc2dgst.c
index 4aa406edc3..302f9ab9a8 100644
--- a/crypto/mdc2/mdc2dgst.c
+++ b/crypto/mdc2/mdc2dgst.c
@@ -59,6 +59,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <openssl/crypto.h>
 #include <openssl/des.h>
 #include <openssl/mdc2.h>
 
diff --git a/crypto/modes/cts128.c b/crypto/modes/cts128.c
index 3348450450..c0e1f3696c 100644
--- a/crypto/modes/cts128.c
+++ b/crypto/modes/cts128.c
@@ -5,6 +5,7 @@
  * forms are granted according to the OpenSSL license.
  */
 
+#include <openssl/crypto.h>
 #include "modes_lcl.h"
 #include <string.h>
 
diff --git a/crypto/rand/randtest.c b/crypto/rand/randtest.c
index 9e92a70b03..bfa7275cfe 100644
--- a/crypto/rand/randtest.c
+++ b/crypto/rand/randtest.c
@@ -58,6 +58,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <openssl/crypto.h>
 #include <openssl/rand.h>
 
 #include "../e_os.h"
diff --git a/crypto/rc4/rc4test.c b/crypto/rc4/rc4test.c
index 633a79e758..a5e30ed96c 100644
--- a/crypto/rc4/rc4test.c
+++ b/crypto/rc4/rc4test.c
@@ -59,6 +59,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <openssl/crypto.h>
 
 #include "../e_os.h"