From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 16 Feb 2011 17:25:01 +0000 (+0000)
Subject: Include openssl/crypto.h first in several other files so FIPS renaming
X-Git-Tag: OpenSSL-fips-2_0-rc1~735
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a3654f058690bbb3d986d1a063b6c3742fd30af5;p=thirdparty%2Fopenssl.git

Include openssl/crypto.h first in several other files so FIPS renaming
is picked up.
---

diff --git a/crypto/camellia/cmll_cbc.c b/crypto/camellia/cmll_cbc.c
index 4c8d455adef..158daea704e 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 3d81b51d3f4..97cc0e72018 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 014e621a34b..6d993bd204e 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 a482befc747..4f5644f7a57 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 09a7ba56aad..8413c81b6bf 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 7c33ed7a933..41026521009 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 c8fa3ee1352..4615f25388d 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 64b92a34fe9..9d02b908113 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 adfcb75cf38..57548af8b2d 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 fda23d522f3..dc3dff1431b 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 8ca3d49dea1..368c6ad04fe 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 e887a3c6f4b..8ce7aba5c6b 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 17a40f9520f..7760e34fa6b 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 23981655685..6811c04ac37 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 d937d08da5f..5e88c55c994 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 058cab6bce0..6a66951733c 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 f4d70e7e0a6..857403ddf98 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 4aa406edc3b..302f9ab9a89 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 33484504508..c0e1f3696c6 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 9e92a70b033..bfa7275cfe6 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 633a79e7589..a5e30ed96c6 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"
 
diff --git a/engines/ccgost/gost_crypt.c b/engines/ccgost/gost_crypt.c
index 4977d1dcf50..9b9f9d8eeb1 100644
--- a/engines/ccgost/gost_crypt.c
+++ b/engines/ccgost/gost_crypt.c
@@ -7,6 +7,7 @@
  *          Requires OpenSSL 0.9.9 for compilation                    *
  **********************************************************************/
 #include <string.h>
+#include <openssl/crypto.h>
 #include "gost89.h"
 #include <openssl/rand.h>
 #include "e_gost_err.h"
diff --git a/ssl/d1_clnt.c b/ssl/d1_clnt.c
index 255c19d7614..706e2282795 100644
--- a/ssl/d1_clnt.c
+++ b/ssl/d1_clnt.c
@@ -114,6 +114,7 @@
  */
 
 #include <stdio.h>
+#include <openssl/crypto.h>
 #include "ssl_locl.h"
 #ifndef OPENSSL_NO_KRB5
 #include "kssl_lcl.h"
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index b7287e5b67d..fe3301349c2 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -149,6 +149,7 @@
  */
 
 #include <stdio.h>
+#include <openssl/crypto.h>
 #include "ssl_locl.h"
 #include "kssl_lcl.h"
 #include <openssl/buffer.h>
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index c41eb8bdfaf..fed90bc5a08 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -152,6 +152,7 @@
 #define NETSCAPE_HANG_BUG
 
 #include <stdio.h>
+#include <openssl/crypto.h>
 #include "ssl_locl.h"
 #include "kssl_lcl.h"
 #include <openssl/buffer.h>
diff --git a/ssl/ssl_asn1.c b/ssl/ssl_asn1.c
index d7f4c6087e3..74c238a0436 100644
--- a/ssl/ssl_asn1.c
+++ b/ssl/ssl_asn1.c
@@ -84,6 +84,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <openssl/crypto.h>
 #include "ssl_locl.h"
 #include <openssl/asn1_mac.h>
 #include <openssl/objects.h>
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 8c1606a80f5..dff60827559 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -146,6 +146,7 @@
 #  include <assert.h>
 #endif
 #include <stdio.h>
+#include <openssl/crypto.h>
 #include "ssl_locl.h"
 #include "kssl_lcl.h"
 #include <openssl/objects.h>
diff --git a/test/dummytest.c b/test/dummytest.c
index 5b4467e042b..fc105712d38 100644
--- a/test/dummytest.c
+++ b/test/dummytest.c
@@ -2,9 +2,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+#include <openssl/crypto.h>
 #include <openssl/e_os2.h>
 #include <openssl/buffer.h>
-#include <openssl/crypto.h>
 
 int main(int argc, char *argv[])
 	{
diff --git a/test/igetest.c b/test/igetest.c
index 1ba900244de..080745c01e1 100644
--- a/test/igetest.c
+++ b/test/igetest.c
@@ -49,6 +49,7 @@
  *
  */
 
+#include <openssl/crypto.h>
 #include <openssl/aes.h>
 #include <openssl/rand.h>
 #include <stdio.h>