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 4c8d455adef3d90d2d03c068b76980782dd90aab..158daea704e38b0fbd5c9a2b8a3d908c4023f7cf 100644 (file)
--- 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 3d81b51d3f42792d15f289cb5f75fba639353614..97cc0e72018ff30661bcdce04e9b11d1839446ed 100644 (file)
--- 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 014e621a34bc6ecdd7efc5079a660e5b408729b5..6d993bd204e5a61b6f11562e0187dd53c4ed8dc9 100644 (file)
--- 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 a482befc74707df29eea9f43444bdde4a2c291ac..4f5644f7a57047ec090d86feaa7797a4b7e45f2c 100644 (file)
--- 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 09a7ba56aadad3f8e7c24b77b5903dfde032f5f8..8413c81b6bf79e29d8c9abef0186c9dfa746c3b6 100644 (file)
--- 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 7c33ed7a93341cdaf261eb6ac70d163fa7fc37b8..4102652100916d8762b7b3ee3f92930f48786990 100644 (file)
--- 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 c8fa3ee1352f7baac8a3f5f6162bae3c3220c99b..4615f25388de07b913792de111860909f2191698 100644 (file)
--- 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 64b92a34fe976075f986e4fea85bec12375bd479..9d02b9081138e15a816ade9a72c24415bdcd66b6 100644 (file)
--- 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 adfcb75cf3878f53f86f5759ca8210871166be4b..57548af8b2dd3bc4bc090a5c9e4da03cec3e5ecc 100644 (file)
--- 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 fda23d522f3fc32c458ce201ecd53dcbdee1cc18..dc3dff1431b1a06cdbe385042b016e60641378d0 100644 (file)
--- 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 8ca3d49dea161a912e86bee122f183cfae4e99d9..368c6ad04fe80fa1aaaf2eaa4be45162ef67b296 100644 (file)
--- 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 e887a3c6f4bd0bf8f71a2c636b3fe147b057c8fc..8ce7aba5c6ba2331e74a683f2d17c9a6b589a718 100644 (file)
--- 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 17a40f9520f0efe9f0382828480d3165fce8f36f..7760e34fa6b06f50a98cdcbc26919e727aec32ab 100644 (file)
--- 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 23981655685800ea24a459af3b7694d9df26eb99..6811c04ac37542aa6bd4ea32d1b57a074f21bf89 100644 (file)
--- 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 d937d08da5ff83198deb525815ca348751c0deff..5e88c55c994c1cd38e1d1ee47ad18f0f7bb716e3 100644 (file)
--- 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 058cab6bce0cb95e039f17ebf1097f77b199c2f3..6a66951733cadd95647bd16853ed4f4a83d0740d 100644 (file)
--- 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 f4d70e7e0a600b51f71464dd369592ce304f2a58..857403ddf9863ed66e6f38e5de6e7997e406b78b 100644 (file)
--- 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 4aa406edc3bab41e2dc9d46db2879b392a6c0b20..302f9ab9a890088753d92952796a4977a5e539a1 100644 (file)
--- 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 334845045087e7af2f10d1d37b9aa8455ba9b753..c0e1f3696c6cd6c3a5672baf9be8ecef3b468ccd 100644 (file)
--- 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 9e92a70b033c032de9e23983f1a63b9fb59d11ce..bfa7275cfe696a581e8875c22dcac455bb746b93 100644 (file)
--- 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 633a79e75890f290b1dc5851dc1c06df6393a696..a5e30ed96c6d43c9d493474338cb1aebac8cb967 100644 (file)
--- 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 4977d1dcf5036a39d828aea0bbc6564b1e03a18a..9b9f9d8eeb1ed6410bd838550a7c02aca2c2638f 100644 (file)
--- 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 255c19d7614ca6041c68bdf9ef46e3236fa815a4..706e2282795369ecc179499d89a361b51b96c5a6 100644 (file)
--- 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 b7287e5b67d9c6fb43b5c473d33be6413decda45..fe3301349c238c67567231084e2bc5f3b2a9448e 100644 (file)
--- 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 c41eb8bdfaf7c855b6dc929d36729393ab471637..fed90bc5a0851efbe143336f68a77325ee68a8bc 100644 (file)
--- 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 d7f4c6087e3a9d8ab9d05552ae9e9671a84e2ba1..74c238a04369e377c8f44da0c0ec42f62661ce86 100644 (file)
--- 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 8c1606a80f588cefc8aefb4f03a72c2111c19b11..dff60827559a98a29efe29842e45631fc5db2b0b 100644 (file)
--- 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 5b4467e042bb7f193cd5c5bc18355445af2de12b..fc105712d3844e9d7d61981e819e28dccdf389a7 100644 (file)
--- 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 1ba900244ded184f5b6ae371462f0d89e63f433a..080745c01e1b5ea8ec23fa6ae9d450d8edb50bc3 100644 (file)
--- 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>