From 2b2d66d4094e5c25789ce68310d86192c377c63b Mon Sep 17 00:00:00 2001 From: Adam Langley Date: Fri, 30 Jan 2015 17:08:37 -0800 Subject: [PATCH] Remove string.h from base.h. Including string.h in base.h causes any file that includes a BoringSSL header to include string.h. Generally this wouldn't be a problem, although string.h might slow down the compile if it wasn't otherwise needed. However, it also causes problems for ipsec-tools in Android because OpenSSL didn't have this behaviour. This change removes string.h from base.h and, instead, adds it to each .c file that requires it. Change-Id: I5968e50b0e230fd3adf9b72dd2836e6f52d6fb37 Reviewed-on: https://boringssl-review.googlesource.com/3200 Reviewed-by: David Benjamin Reviewed-by: Adam Langley --- crypto/asn1/a_bitstr.c | 3 +++ crypto/asn1/a_bytes.c | 2 ++ crypto/asn1/a_enum.c | 2 ++ crypto/asn1/a_gentm.c | 2 ++ crypto/asn1/a_int.c | 2 ++ crypto/asn1/a_mbstr.c | 2 ++ crypto/asn1/a_object.c | 1 + crypto/asn1/a_strnid.c | 1 + crypto/asn1/a_time.c | 2 ++ crypto/asn1/a_utctm.c | 2 ++ crypto/asn1/asn1_lib.c | 1 + crypto/asn1/bio_asn1.c | 1 + crypto/asn1/t_bitst.c | 2 ++ crypto/asn1/tasn_dec.c | 2 ++ crypto/asn1/tasn_enc.c | 2 ++ crypto/asn1/tasn_new.c | 2 ++ crypto/asn1/tasn_utl.c | 2 ++ crypto/asn1/x_long.c | 2 ++ crypto/base64/base64.c | 1 + crypto/bio/bio.c | 3 ++- crypto/bio/bio_mem.c | 1 + crypto/bio/buffer.c | 2 ++ crypto/bio/connect.c | 1 + crypto/bio/fd.c | 1 + crypto/bio/file.c | 1 + crypto/bio/hexdump.c | 1 + crypto/bio/pair.c | 1 + crypto/bio/socket.c | 1 + crypto/bio/socket_helper.c | 1 + crypto/bn/bn.c | 2 ++ crypto/bn/bn_test.c | 2 ++ crypto/bn/convert.c | 1 + crypto/bn/ctx.c | 2 ++ crypto/bn/exponentiation.c | 1 + crypto/bn/montgomery.c | 2 ++ crypto/bn/mul.c | 1 + crypto/bn/random.c | 2 ++ crypto/bn/shift.c | 3 +++ crypto/buf/buf.c | 2 ++ crypto/bytestring/ber.c | 2 ++ crypto/bytestring/bytestring_test.c | 1 + crypto/bytestring/cbb.c | 1 + crypto/chacha/chacha_generic.c | 3 +++ crypto/cipher/cipher_test.c | 1 + crypto/cipher/e_aes.c | 2 ++ crypto/cipher/e_chacha20poly1305.c | 2 ++ crypto/cipher/e_null.c | 2 ++ crypto/cipher/e_rc4.c | 1 + crypto/cipher/tls_cbc.c | 1 + crypto/cpu-intel.c | 3 ++- crypto/dh/dh.c | 2 ++ crypto/dh/dh_test.c | 1 + crypto/digest/md32_common.h | 2 ++ crypto/directory_posix.c | 1 + crypto/directory_win.c | 3 ++- crypto/dsa/dsa.c | 3 +++ crypto/dsa/dsa_asn1.c | 2 ++ crypto/dsa/dsa_impl.c | 2 ++ crypto/dsa/dsa_test.c | 2 ++ crypto/ec/ec.c | 2 ++ crypto/ec/ec_asn1.c | 2 ++ crypto/ec/ec_key.c | 2 ++ crypto/ec/simple.c | 2 ++ crypto/ec/wnaf.c | 2 ++ crypto/ecdh/ecdh.c | 2 ++ crypto/ecdsa/ecdsa.c | 2 ++ crypto/engine/engine.c | 2 ++ crypto/err/err.c | 1 + crypto/err/err_impl.c | 1 + crypto/err/err_test.c | 1 + crypto/evp/evp.c | 1 + crypto/evp/evp_ctx.c | 1 + crypto/evp/p_ec.c | 2 ++ crypto/evp/p_hmac.c | 2 ++ crypto/evp/p_rsa.c | 2 ++ crypto/evp/pbkdf.c | 2 ++ crypto/evp/pbkdf_test.c | 1 + crypto/hkdf/hkdf.c | 1 + crypto/hkdf/hkdf_test.c | 1 + crypto/hmac/hmac.c | 1 + crypto/hmac/hmac_test.c | 1 + crypto/lhash/lhash.c | 1 + crypto/md4/md4.c | 2 ++ crypto/modes/cbc.c | 1 + crypto/modes/cfb.c | 1 + crypto/modes/ctr.c | 1 + crypto/modes/gcm.c | 1 + crypto/modes/gcm_test.c | 1 + crypto/obj/obj.c | 1 + crypto/pem/pem_info.c | 3 ++- crypto/pem/pem_lib.c | 1 + crypto/pem/pem_pkey.c | 1 + crypto/pkcs8/p5_pbe.c | 2 ++ crypto/pkcs8/p5_pbev2.c | 1 + crypto/pkcs8/pkcs8.c | 1 + crypto/poly1305/poly1305_arm.c | 3 +++ crypto/rand/windows.c | 1 + crypto/rsa/blinding.c | 3 +++ crypto/rsa/padding.c | 1 + crypto/rsa/rsa.c | 2 ++ crypto/rsa/rsa_impl.c | 2 ++ crypto/rsa/rsa_test.c | 2 ++ crypto/stack/stack.c | 2 ++ crypto/thread.c | 2 ++ crypto/x509/a_strex.c | 2 ++ crypto/x509/asn1_gen.c | 2 ++ crypto/x509/by_dir.c | 3 ++- crypto/x509/pkcs7_test.c | 1 + crypto/x509/x509_cmp.c | 2 ++ crypto/x509/x509_lu.c | 2 ++ crypto/x509/x509_obj.c | 2 ++ crypto/x509/x509_vfy.c | 1 + crypto/x509/x509_vpm.c | 3 +++ crypto/x509/x509name.c | 2 ++ crypto/x509/x509spki.c | 2 ++ crypto/x509/x_name.c | 1 + crypto/x509/x_pkey.c | 2 ++ crypto/x509v3/pcy_tree.c | 2 ++ crypto/x509v3/v3_akey.c | 1 + crypto/x509v3/v3_alt.c | 1 + crypto/x509v3/v3_bcons.c | 1 + crypto/x509v3/v3_bitst.c | 1 + crypto/x509v3/v3_conf.c | 3 ++- crypto/x509v3/v3_cpols.c | 1 + crypto/x509v3/v3_crld.c | 1 + crypto/x509v3/v3_ia5.c | 2 +- crypto/x509v3/v3_info.c | 1 + crypto/x509v3/v3_pci.c | 1 + crypto/x509v3/v3_pcons.c | 1 + crypto/x509v3/v3_purp.c | 2 ++ crypto/x509v3/v3_skey.c | 1 + crypto/x509v3/v3_sxnet.c | 1 + crypto/x509v3/v3_utl.c | 1 + include/openssl/base.h | 1 - ssl/pqueue/pqueue.c | 2 ++ ssl/test/async_bio.cc | 3 +++ ssl/test/bssl_shim.cc | 1 + ssl/test/packeted_bio.cc | 3 +++ tool/digest.cc | 2 ++ tool/pkcs12.cc | 1 + tool/speed.cc | 2 ++ tool/transport_common.cc | 1 + 142 files changed, 226 insertions(+), 8 deletions(-) diff --git a/crypto/asn1/a_bitstr.c b/crypto/asn1/a_bitstr.c index 503845555..8055f0c58 100644 --- a/crypto/asn1/a_bitstr.c +++ b/crypto/asn1/a_bitstr.c @@ -56,9 +56,12 @@ #include +#include + #include #include + int ASN1_BIT_STRING_set(ASN1_BIT_STRING *x, unsigned char *d, int len) { return M_ASN1_BIT_STRING_set(x, d, len); } diff --git a/crypto/asn1/a_bytes.c b/crypto/asn1/a_bytes.c index b9dd816fb..8874f4899 100644 --- a/crypto/asn1/a_bytes.c +++ b/crypto/asn1/a_bytes.c @@ -56,6 +56,8 @@ #include +#include + #include #include #include diff --git a/crypto/asn1/a_enum.c b/crypto/asn1/a_enum.c index d6d237a84..a581a34bb 100644 --- a/crypto/asn1/a_enum.c +++ b/crypto/asn1/a_enum.c @@ -56,6 +56,8 @@ #include +#include + #include #include diff --git a/crypto/asn1/a_gentm.c b/crypto/asn1/a_gentm.c index b5bddb8b8..355feff1a 100644 --- a/crypto/asn1/a_gentm.c +++ b/crypto/asn1/a_gentm.c @@ -56,6 +56,8 @@ #include +#include + #include #include #include diff --git a/crypto/asn1/a_int.c b/crypto/asn1/a_int.c index 6d7e2258a..eb0887a1e 100644 --- a/crypto/asn1/a_int.c +++ b/crypto/asn1/a_int.c @@ -56,6 +56,8 @@ #include +#include + #include #include diff --git a/crypto/asn1/a_mbstr.c b/crypto/asn1/a_mbstr.c index 007f0e16e..9abe659db 100644 --- a/crypto/asn1/a_mbstr.c +++ b/crypto/asn1/a_mbstr.c @@ -56,6 +56,8 @@ #include +#include + #include #include diff --git a/crypto/asn1/a_object.c b/crypto/asn1/a_object.c index 16d5e7913..189886c65 100644 --- a/crypto/asn1/a_object.c +++ b/crypto/asn1/a_object.c @@ -57,6 +57,7 @@ #include #include +#include #include #include diff --git a/crypto/asn1/a_strnid.c b/crypto/asn1/a_strnid.c index e61de70c5..df849e16a 100644 --- a/crypto/asn1/a_strnid.c +++ b/crypto/asn1/a_strnid.c @@ -57,6 +57,7 @@ #include #include /* For bsearch */ +#include #include #include diff --git a/crypto/asn1/a_time.c b/crypto/asn1/a_time.c index 4786024ee..f0badcca9 100644 --- a/crypto/asn1/a_time.c +++ b/crypto/asn1/a_time.c @@ -56,6 +56,8 @@ #include +#include + #include #include #include diff --git a/crypto/asn1/a_utctm.c b/crypto/asn1/a_utctm.c index cb29d4cd1..7a3f5f6db 100644 --- a/crypto/asn1/a_utctm.c +++ b/crypto/asn1/a_utctm.c @@ -56,6 +56,8 @@ #include +#include + #include #include #include diff --git a/crypto/asn1/asn1_lib.c b/crypto/asn1/asn1_lib.c index 83816c93d..1fc2c060f 100644 --- a/crypto/asn1/asn1_lib.c +++ b/crypto/asn1/asn1_lib.c @@ -57,6 +57,7 @@ #include #include +#include #include #include diff --git a/crypto/asn1/bio_asn1.c b/crypto/asn1/bio_asn1.c index faea304bc..15f233be6 100644 --- a/crypto/asn1/bio_asn1.c +++ b/crypto/asn1/bio_asn1.c @@ -57,6 +57,7 @@ #include #include +#include #include #include diff --git a/crypto/asn1/t_bitst.c b/crypto/asn1/t_bitst.c index cc2c50b36..1ca6e089a 100644 --- a/crypto/asn1/t_bitst.c +++ b/crypto/asn1/t_bitst.c @@ -56,6 +56,8 @@ #include +#include + #include diff --git a/crypto/asn1/tasn_dec.c b/crypto/asn1/tasn_dec.c index e8c5cd846..4cece8943 100644 --- a/crypto/asn1/tasn_dec.c +++ b/crypto/asn1/tasn_dec.c @@ -56,6 +56,8 @@ #include +#include + #include #include #include diff --git a/crypto/asn1/tasn_enc.c b/crypto/asn1/tasn_enc.c index 54f784a29..38e14d2a8 100644 --- a/crypto/asn1/tasn_enc.c +++ b/crypto/asn1/tasn_enc.c @@ -56,6 +56,8 @@ #include +#include + #include #include diff --git a/crypto/asn1/tasn_new.c b/crypto/asn1/tasn_new.c index 8a2b27da0..b68eed70c 100644 --- a/crypto/asn1/tasn_new.c +++ b/crypto/asn1/tasn_new.c @@ -56,6 +56,8 @@ #include +#include + #include #include #include diff --git a/crypto/asn1/tasn_utl.c b/crypto/asn1/tasn_utl.c index 250975a62..f6045e402 100644 --- a/crypto/asn1/tasn_utl.c +++ b/crypto/asn1/tasn_utl.c @@ -56,6 +56,8 @@ #include +#include + #include #include #include diff --git a/crypto/asn1/x_long.c b/crypto/asn1/x_long.c index a3f80abb7..5c2f96e93 100644 --- a/crypto/asn1/x_long.c +++ b/crypto/asn1/x_long.c @@ -56,6 +56,8 @@ #include +#include + #include #include #include diff --git a/crypto/base64/base64.c b/crypto/base64/base64.c index 5fe23a526..12a52cfdf 100644 --- a/crypto/base64/base64.c +++ b/crypto/base64/base64.c @@ -58,6 +58,7 @@ #include #include +#include static const unsigned char data_bin2ascii[65] = diff --git a/crypto/bio/bio.c b/crypto/bio/bio.c index 7bd2976f9..4d947a6ce 100644 --- a/crypto/bio/bio.c +++ b/crypto/bio/bio.c @@ -57,8 +57,9 @@ #include #include -#include #include +#include +#include #include #include diff --git a/crypto/bio/bio_mem.c b/crypto/bio/bio_mem.c index 6e90db5cc..f3aad6fb7 100644 --- a/crypto/bio/bio_mem.c +++ b/crypto/bio/bio_mem.c @@ -57,6 +57,7 @@ #include #include +#include #include #include diff --git a/crypto/bio/buffer.c b/crypto/bio/buffer.c index 415a47136..5e423a121 100644 --- a/crypto/bio/buffer.c +++ b/crypto/bio/buffer.c @@ -56,6 +56,8 @@ #include +#include + #include #include #include diff --git a/crypto/bio/connect.c b/crypto/bio/connect.c index ef1f14d6f..66ac3a7b1 100644 --- a/crypto/bio/connect.c +++ b/crypto/bio/connect.c @@ -59,6 +59,7 @@ #include #include #include +#include #if !defined(OPENSSL_WINDOWS) #include diff --git a/crypto/bio/fd.c b/crypto/bio/fd.c index c54647c96..6b70eac02 100644 --- a/crypto/bio/fd.c +++ b/crypto/bio/fd.c @@ -57,6 +57,7 @@ #include #include +#include #if !defined(OPENSSL_WINDOWS) #include diff --git a/crypto/bio/file.c b/crypto/bio/file.c index e1a67ca8f..7f57aad2a 100644 --- a/crypto/bio/file.c +++ b/crypto/bio/file.c @@ -76,6 +76,7 @@ #include #include +#include #include #include diff --git a/crypto/bio/hexdump.c b/crypto/bio/hexdump.c index 61a2673af..17f55183f 100644 --- a/crypto/bio/hexdump.c +++ b/crypto/bio/hexdump.c @@ -57,6 +57,7 @@ #include #include +#include /* hexdump_ctx contains the state of a hexdump. */ diff --git a/crypto/bio/pair.c b/crypto/bio/pair.c index fe6a27501..de2b4cbcf 100644 --- a/crypto/bio/pair.c +++ b/crypto/bio/pair.c @@ -53,6 +53,7 @@ #include #include +#include #include #include diff --git a/crypto/bio/socket.c b/crypto/bio/socket.c index 671a04688..590447ffe 100644 --- a/crypto/bio/socket.c +++ b/crypto/bio/socket.c @@ -58,6 +58,7 @@ #include #include +#include #if !defined(OPENSSL_WINDOWS) #include diff --git a/crypto/bio/socket_helper.c b/crypto/bio/socket_helper.c index 3fb806e8a..52e1606cd 100644 --- a/crypto/bio/socket_helper.c +++ b/crypto/bio/socket_helper.c @@ -18,6 +18,7 @@ #include #include +#include #include #if !defined(OPENSSL_WINDOWS) diff --git a/crypto/bn/bn.c b/crypto/bn/bn.c index a996a47bb..368c4f1a9 100644 --- a/crypto/bn/bn.c +++ b/crypto/bn/bn.c @@ -57,6 +57,8 @@ #include #include +#include + #include #include diff --git a/crypto/bn/bn_test.c b/crypto/bn/bn_test.c index 0fa51555f..e342ed81a 100644 --- a/crypto/bn/bn_test.c +++ b/crypto/bn/bn_test.c @@ -68,6 +68,7 @@ * Laboratories. */ #include +#include #include #include @@ -77,6 +78,7 @@ #include "internal.h" + static const int num0 = 100; /* number of tests */ static const int num1 = 50; /* additional tests for some functions */ static const int num2 = 5; /* number of tests for slow functions */ diff --git a/crypto/bn/convert.c b/crypto/bn/convert.c index 1ba7cb694..f764eed9f 100644 --- a/crypto/bn/convert.c +++ b/crypto/bn/convert.c @@ -58,6 +58,7 @@ #include #include +#include #include #include diff --git a/crypto/bn/ctx.c b/crypto/bn/ctx.c index a89f87d44..e54007b4a 100644 --- a/crypto/bn/ctx.c +++ b/crypto/bn/ctx.c @@ -54,6 +54,8 @@ #include +#include + #include #include diff --git a/crypto/bn/exponentiation.c b/crypto/bn/exponentiation.c index afc428777..53f3e9c47 100644 --- a/crypto/bn/exponentiation.c +++ b/crypto/bn/exponentiation.c @@ -109,6 +109,7 @@ #include #include +#include #include #include diff --git a/crypto/bn/montgomery.c b/crypto/bn/montgomery.c index ddd2b26cd..65e177cab 100644 --- a/crypto/bn/montgomery.c +++ b/crypto/bn/montgomery.c @@ -108,6 +108,8 @@ #include +#include + #include #include diff --git a/crypto/bn/mul.c b/crypto/bn/mul.c index 54b208313..80c62885f 100644 --- a/crypto/bn/mul.c +++ b/crypto/bn/mul.c @@ -57,6 +57,7 @@ #include #include +#include #include "internal.h" diff --git a/crypto/bn/random.c b/crypto/bn/random.c index 85fd4475e..285bf26ce 100644 --- a/crypto/bn/random.c +++ b/crypto/bn/random.c @@ -108,6 +108,8 @@ #include +#include + #include #include #include diff --git a/crypto/bn/shift.c b/crypto/bn/shift.c index 384a697e7..1e3b7c3f5 100644 --- a/crypto/bn/shift.c +++ b/crypto/bn/shift.c @@ -56,8 +56,11 @@ #include +#include + #include "internal.h" + int BN_lshift(BIGNUM *r, const BIGNUM *a, int n) { int i, nw, lb, rb; BN_ULONG *t, *f; diff --git a/crypto/buf/buf.c b/crypto/buf/buf.c index 3fd822e2c..5769e77c4 100644 --- a/crypto/buf/buf.c +++ b/crypto/buf/buf.c @@ -56,6 +56,8 @@ #include +#include + #include #include diff --git a/crypto/bytestring/ber.c b/crypto/bytestring/ber.c index b5b373de1..2729fa137 100644 --- a/crypto/bytestring/ber.c +++ b/crypto/bytestring/ber.c @@ -14,6 +14,8 @@ #include +#include + #include "internal.h" diff --git a/crypto/bytestring/bytestring_test.c b/crypto/bytestring/bytestring_test.c index ba70bcfa1..cd0155e11 100644 --- a/crypto/bytestring/bytestring_test.c +++ b/crypto/bytestring/bytestring_test.c @@ -14,6 +14,7 @@ #include #include +#include #include #include diff --git a/crypto/bytestring/cbb.c b/crypto/bytestring/cbb.c index f8e107049..44288362c 100644 --- a/crypto/bytestring/cbb.c +++ b/crypto/bytestring/cbb.c @@ -15,6 +15,7 @@ #include #include +#include #include diff --git a/crypto/chacha/chacha_generic.c b/crypto/chacha/chacha_generic.c index 3e73d8e48..31cf4f027 100644 --- a/crypto/chacha/chacha_generic.c +++ b/crypto/chacha/chacha_generic.c @@ -16,8 +16,11 @@ #include +#include + #include + #if defined(OPENSSL_WINDOWS) || (!defined(OPENSSL_X86_64) && !defined(OPENSSL_X86)) || !defined(__SSE2__) /* sigma contains the ChaCha constants, which happen to be an ASCII string. */ diff --git a/crypto/cipher/cipher_test.c b/crypto/cipher/cipher_test.c index b91b505a1..2b04ad511 100644 --- a/crypto/cipher/cipher_test.c +++ b/crypto/cipher/cipher_test.c @@ -55,6 +55,7 @@ * [including the GNU Public Licence.] */ #include +#include #include #include diff --git a/crypto/cipher/e_aes.c b/crypto/cipher/e_aes.c index 55376598f..f92bb8eef 100644 --- a/crypto/cipher/e_aes.c +++ b/crypto/cipher/e_aes.c @@ -46,6 +46,8 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. * ==================================================================== */ +#include + #include #include #include diff --git a/crypto/cipher/e_chacha20poly1305.c b/crypto/cipher/e_chacha20poly1305.c index 5c24717a5..1cdcbca5b 100644 --- a/crypto/cipher/e_chacha20poly1305.c +++ b/crypto/cipher/e_chacha20poly1305.c @@ -14,6 +14,8 @@ #include +#include + #include #include #include diff --git a/crypto/cipher/e_null.c b/crypto/cipher/e_null.c index 196520d43..cfe1d1b29 100644 --- a/crypto/cipher/e_null.c +++ b/crypto/cipher/e_null.c @@ -56,6 +56,8 @@ #include +#include + #include #include "internal.h" diff --git a/crypto/cipher/e_rc4.c b/crypto/cipher/e_rc4.c index 7f988842e..04ddcb65f 100644 --- a/crypto/cipher/e_rc4.c +++ b/crypto/cipher/e_rc4.c @@ -57,6 +57,7 @@ #include #include +#include #include #include diff --git a/crypto/cipher/tls_cbc.c b/crypto/cipher/tls_cbc.c index 73952e5a8..8bca2f307 100644 --- a/crypto/cipher/tls_cbc.c +++ b/crypto/cipher/tls_cbc.c @@ -51,6 +51,7 @@ * Hudson (tjh@cryptsoft.com). */ #include +#include #include #include diff --git a/crypto/cpu-intel.c b/crypto/cpu-intel.c index 3f65e74df..69f4570d4 100644 --- a/crypto/cpu-intel.c +++ b/crypto/cpu-intel.c @@ -63,8 +63,9 @@ #if !defined(OPENSSL_NO_ASM) && (defined(OPENSSL_X86) || defined(OPENSSL_X86_64)) -#include #include +#include +#include /* OPENSSL_ia32_cpuid is defined in cpu-x86_64-asm.pl. */ extern uint64_t OPENSSL_ia32_cpuid(uint32_t*); diff --git a/crypto/dh/dh.c b/crypto/dh/dh.c index cee306b14..7a50da7be 100644 --- a/crypto/dh/dh.c +++ b/crypto/dh/dh.c @@ -56,6 +56,8 @@ #include +#include + #include #include #include diff --git a/crypto/dh/dh_test.c b/crypto/dh/dh_test.c index 31b3dd903..3575f3495 100644 --- a/crypto/dh/dh_test.c +++ b/crypto/dh/dh_test.c @@ -57,6 +57,7 @@ #include #include +#include #include #include diff --git a/crypto/digest/md32_common.h b/crypto/digest/md32_common.h index 51508a6d3..a4ce3558c 100644 --- a/crypto/digest/md32_common.h +++ b/crypto/digest/md32_common.h @@ -51,6 +51,8 @@ #include +#include + #if defined(__cplusplus) extern "C" { diff --git a/crypto/directory_posix.c b/crypto/directory_posix.c index 695e964d8..c16701dab 100644 --- a/crypto/directory_posix.c +++ b/crypto/directory_posix.c @@ -35,6 +35,7 @@ #include #include +#include #if defined(OPENSSL_PNACL) /* pnacl doesn't include readdir_r! So we do the best we can. */ diff --git a/crypto/directory_win.c b/crypto/directory_win.c index 9415f1dfd..2e4600f53 100644 --- a/crypto/directory_win.c +++ b/crypto/directory_win.c @@ -33,8 +33,9 @@ #pragma warning(push, 3) #include #pragma warning(pop) -#include #include +#include +#include #ifndef NAME_MAX #define NAME_MAX 255 diff --git a/crypto/dsa/dsa.c b/crypto/dsa/dsa.c index cbd36bee6..8816b631c 100644 --- a/crypto/dsa/dsa.c +++ b/crypto/dsa/dsa.c @@ -59,6 +59,8 @@ #include +#include + #include #include #include @@ -68,6 +70,7 @@ #include "internal.h" + extern const DSA_METHOD DSA_default_method; DSA *DSA_new(void) { return DSA_new_method(NULL); } diff --git a/crypto/dsa/dsa_asn1.c b/crypto/dsa/dsa_asn1.c index 72b2cc615..933fba781 100644 --- a/crypto/dsa/dsa_asn1.c +++ b/crypto/dsa/dsa_asn1.c @@ -54,6 +54,8 @@ #include +#include + #include #include #include diff --git a/crypto/dsa/dsa_impl.c b/crypto/dsa/dsa_impl.c index fd027b018..6719758ba 100644 --- a/crypto/dsa/dsa_impl.c +++ b/crypto/dsa/dsa_impl.c @@ -59,6 +59,8 @@ #include +#include + #include #include #include diff --git a/crypto/dsa/dsa_test.c b/crypto/dsa/dsa_test.c index e38720cf5..12736381c 100644 --- a/crypto/dsa/dsa_test.c +++ b/crypto/dsa/dsa_test.c @@ -59,6 +59,8 @@ #include +#include + #include #include #include diff --git a/crypto/ec/ec.c b/crypto/ec/ec.c index 931d4a4e1..f9d8dc5b4 100644 --- a/crypto/ec/ec.c +++ b/crypto/ec/ec.c @@ -67,6 +67,8 @@ #include +#include + #include #include #include diff --git a/crypto/ec/ec_asn1.c b/crypto/ec/ec_asn1.c index a2f14883a..ce9b3f407 100644 --- a/crypto/ec/ec_asn1.c +++ b/crypto/ec/ec_asn1.c @@ -53,6 +53,8 @@ #include +#include + #include #include #include diff --git a/crypto/ec/ec_key.c b/crypto/ec/ec_key.c index 09944aadc..c8f06248b 100644 --- a/crypto/ec/ec_key.c +++ b/crypto/ec/ec_key.c @@ -67,6 +67,8 @@ #include +#include + #include #include #include diff --git a/crypto/ec/simple.c b/crypto/ec/simple.c index 32089b27c..b3f96fa8f 100644 --- a/crypto/ec/simple.c +++ b/crypto/ec/simple.c @@ -67,6 +67,8 @@ #include +#include + #include #include #include diff --git a/crypto/ec/wnaf.c b/crypto/ec/wnaf.c index 1976460c3..9016328e7 100644 --- a/crypto/ec/wnaf.c +++ b/crypto/ec/wnaf.c @@ -67,6 +67,8 @@ #include +#include + #include #include #include diff --git a/crypto/ecdh/ecdh.c b/crypto/ecdh/ecdh.c index 6f9d0de1a..d4497f178 100644 --- a/crypto/ecdh/ecdh.c +++ b/crypto/ecdh/ecdh.c @@ -66,6 +66,8 @@ #include +#include + #include #include #include diff --git a/crypto/ecdsa/ecdsa.c b/crypto/ecdsa/ecdsa.c index 644246257..d389799fc 100644 --- a/crypto/ecdsa/ecdsa.c +++ b/crypto/ecdsa/ecdsa.c @@ -52,6 +52,8 @@ #include +#include + #include #include #include diff --git a/crypto/engine/engine.c b/crypto/engine/engine.c index 1453e61ca..5b8cf1c5d 100644 --- a/crypto/engine/engine.c +++ b/crypto/engine/engine.c @@ -14,6 +14,8 @@ #include +#include + #include #include #include diff --git a/crypto/err/err.c b/crypto/err/err.c index eb6e526e7..ec2062ebb 100644 --- a/crypto/err/err.c +++ b/crypto/err/err.c @@ -113,6 +113,7 @@ #include #include #include +#include #if defined(OPENSSL_WINDOWS) #pragma warning(push, 3) diff --git a/crypto/err/err_impl.c b/crypto/err/err_impl.c index 8cfcb46dc..32cff35a6 100644 --- a/crypto/err/err_impl.c +++ b/crypto/err/err_impl.c @@ -109,6 +109,7 @@ #include #include +#include #include #include diff --git a/crypto/err/err_test.c b/crypto/err/err_test.c index 09dc1f626..bf36201fc 100644 --- a/crypto/err/err_test.c +++ b/crypto/err/err_test.c @@ -13,6 +13,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ #include +#include #include #include diff --git a/crypto/evp/evp.c b/crypto/evp/evp.c index ab84b4826..8a1d51365 100644 --- a/crypto/evp/evp.c +++ b/crypto/evp/evp.c @@ -57,6 +57,7 @@ #include #include +#include #include #include diff --git a/crypto/evp/evp_ctx.c b/crypto/evp/evp_ctx.c index e1c2886c9..a383725ea 100644 --- a/crypto/evp/evp_ctx.c +++ b/crypto/evp/evp_ctx.c @@ -57,6 +57,7 @@ #include #include +#include #include #include diff --git a/crypto/evp/p_ec.c b/crypto/evp/p_ec.c index fd9685fba..c274131b3 100644 --- a/crypto/evp/p_ec.c +++ b/crypto/evp/p_ec.c @@ -55,6 +55,8 @@ #include +#include + #include #include #include diff --git a/crypto/evp/p_hmac.c b/crypto/evp/p_hmac.c index a04a74f62..6d9a909a3 100644 --- a/crypto/evp/p_hmac.c +++ b/crypto/evp/p_hmac.c @@ -55,6 +55,8 @@ #include +#include + #include #include #include diff --git a/crypto/evp/p_rsa.c b/crypto/evp/p_rsa.c index 1c42fbd23..31f5aaa38 100644 --- a/crypto/evp/p_rsa.c +++ b/crypto/evp/p_rsa.c @@ -55,6 +55,8 @@ #include +#include + #include #include #include diff --git a/crypto/evp/pbkdf.c b/crypto/evp/pbkdf.c index 4a18b0873..be6ed86ae 100644 --- a/crypto/evp/pbkdf.c +++ b/crypto/evp/pbkdf.c @@ -55,6 +55,8 @@ #include +#include + #include diff --git a/crypto/evp/pbkdf_test.c b/crypto/evp/pbkdf_test.c index 88b3dbe67..e3ba616f1 100644 --- a/crypto/evp/pbkdf_test.c +++ b/crypto/evp/pbkdf_test.c @@ -13,6 +13,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ #include +#include #include #include diff --git a/crypto/hkdf/hkdf.c b/crypto/hkdf/hkdf.c index be51bc344..bb7f5a464 100644 --- a/crypto/hkdf/hkdf.c +++ b/crypto/hkdf/hkdf.c @@ -15,6 +15,7 @@ #include #include +#include #include #include diff --git a/crypto/hkdf/hkdf_test.c b/crypto/hkdf/hkdf_test.c index a098fba29..7467fe031 100644 --- a/crypto/hkdf/hkdf_test.c +++ b/crypto/hkdf/hkdf_test.c @@ -13,6 +13,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ #include +#include #include #include diff --git a/crypto/hmac/hmac.c b/crypto/hmac/hmac.c index c5b4bd19f..f179fede6 100644 --- a/crypto/hmac/hmac.c +++ b/crypto/hmac/hmac.c @@ -57,6 +57,7 @@ #include #include +#include #include diff --git a/crypto/hmac/hmac_test.c b/crypto/hmac/hmac_test.c index 0ebfb98e7..ecc418aa8 100644 --- a/crypto/hmac/hmac_test.c +++ b/crypto/hmac/hmac_test.c @@ -56,6 +56,7 @@ #include #include +#include #include #include diff --git a/crypto/lhash/lhash.c b/crypto/lhash/lhash.c index ce1741a77..c282fa8ef 100644 --- a/crypto/lhash/lhash.c +++ b/crypto/lhash/lhash.c @@ -57,6 +57,7 @@ #include #include +#include #include diff --git a/crypto/md4/md4.c b/crypto/md4/md4.c index 8e869452b..8fb357b59 100644 --- a/crypto/md4/md4.c +++ b/crypto/md4/md4.c @@ -56,6 +56,8 @@ #include +#include + /* Implemented from RFC1186 The MD4 Message-Digest Algorithm. */ diff --git a/crypto/modes/cbc.c b/crypto/modes/cbc.c index 83d58f0f5..a2ad26ca1 100644 --- a/crypto/modes/cbc.c +++ b/crypto/modes/cbc.c @@ -48,6 +48,7 @@ #include #include +#include #include "internal.h" diff --git a/crypto/modes/cfb.c b/crypto/modes/cfb.c index df7cb771f..738a43804 100644 --- a/crypto/modes/cfb.c +++ b/crypto/modes/cfb.c @@ -49,6 +49,7 @@ #include #include +#include #include "internal.h" diff --git a/crypto/modes/ctr.c b/crypto/modes/ctr.c index 3f8f91fb1..61832ba47 100644 --- a/crypto/modes/ctr.c +++ b/crypto/modes/ctr.c @@ -48,6 +48,7 @@ #include #include +#include #include "internal.h" diff --git a/crypto/modes/gcm.c b/crypto/modes/gcm.c index f09637bf7..eeaeeffce 100644 --- a/crypto/modes/gcm.c +++ b/crypto/modes/gcm.c @@ -49,6 +49,7 @@ #include #include +#include #include #include diff --git a/crypto/modes/gcm_test.c b/crypto/modes/gcm_test.c index 5308976e4..29f9d95fe 100644 --- a/crypto/modes/gcm_test.c +++ b/crypto/modes/gcm_test.c @@ -47,6 +47,7 @@ * ==================================================================== */ #include +#include #include #include diff --git a/crypto/obj/obj.c b/crypto/obj/obj.c index bfcc08b3a..b04321b88 100644 --- a/crypto/obj/obj.c +++ b/crypto/obj/obj.c @@ -57,6 +57,7 @@ #include #include +#include #include #include diff --git a/crypto/pem/pem_info.c b/crypto/pem/pem_info.c index c4974c200..3f02619be 100644 --- a/crypto/pem/pem_info.c +++ b/crypto/pem/pem_info.c @@ -58,8 +58,9 @@ #include -#include #include +#include +#include #include #include diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c index 087600819..ff72c4476 100644 --- a/crypto/pem/pem_lib.c +++ b/crypto/pem/pem_lib.c @@ -58,6 +58,7 @@ #include #include #include +#include #include #include diff --git a/crypto/pem/pem_pkey.c b/crypto/pem/pem_pkey.c index 0ef08d0e0..c0aba51f3 100644 --- a/crypto/pem/pem_pkey.c +++ b/crypto/pem/pem_pkey.c @@ -57,6 +57,7 @@ #include #include +#include #include #include diff --git a/crypto/pkcs8/p5_pbe.c b/crypto/pkcs8/p5_pbe.c index 7b18b6f8e..f30ae79c0 100644 --- a/crypto/pkcs8/p5_pbe.c +++ b/crypto/pkcs8/p5_pbe.c @@ -53,6 +53,8 @@ * (eay@cryptsoft.com). This product includes software written by Tim * Hudson (tjh@cryptsoft.com). */ +#include + #include #include #include diff --git a/crypto/pkcs8/p5_pbev2.c b/crypto/pkcs8/p5_pbev2.c index 1af2af228..9eb98480d 100644 --- a/crypto/pkcs8/p5_pbev2.c +++ b/crypto/pkcs8/p5_pbev2.c @@ -53,6 +53,7 @@ * (eay@cryptsoft.com). This product includes software written by Tim * Hudson (tjh@cryptsoft.com). */ +#include #include #include diff --git a/crypto/pkcs8/pkcs8.c b/crypto/pkcs8/pkcs8.c index 218557909..0b1dfba82 100644 --- a/crypto/pkcs8/pkcs8.c +++ b/crypto/pkcs8/pkcs8.c @@ -57,6 +57,7 @@ #include #include +#include #include #include diff --git a/crypto/poly1305/poly1305_arm.c b/crypto/poly1305/poly1305_arm.c index 002a4c436..61ebec540 100644 --- a/crypto/poly1305/poly1305_arm.c +++ b/crypto/poly1305/poly1305_arm.c @@ -19,6 +19,9 @@ #if defined(OPENSSL_ARM) && !defined(OPENSSL_NO_ASM) +#include + + typedef struct { uint32_t v[12]; /* for alignment; only using 10 */ } fe1305x2; diff --git a/crypto/rand/windows.c b/crypto/rand/windows.c index 5d12ae84a..6f3f3a796 100644 --- a/crypto/rand/windows.c +++ b/crypto/rand/windows.c @@ -32,6 +32,7 @@ #pragma warning(pop) + void RAND_cleanup(void) { } diff --git a/crypto/rsa/blinding.c b/crypto/rsa/blinding.c index 04f672af6..06f87a782 100644 --- a/crypto/rsa/blinding.c +++ b/crypto/rsa/blinding.c @@ -108,12 +108,15 @@ #include +#include + #include #include #include #include "internal.h" + #define BN_BLINDING_COUNTER 32 struct bn_blinding_st { diff --git a/crypto/rsa/padding.c b/crypto/rsa/padding.c index 4c25d9cdf..66fdf13ba 100644 --- a/crypto/rsa/padding.c +++ b/crypto/rsa/padding.c @@ -56,6 +56,7 @@ #include #include +#include #include #include diff --git a/crypto/rsa/rsa.c b/crypto/rsa/rsa.c index 1ea5fef70..cfdd7ff87 100644 --- a/crypto/rsa/rsa.c +++ b/crypto/rsa/rsa.c @@ -56,6 +56,8 @@ #include +#include + #include #include #include diff --git a/crypto/rsa/rsa_impl.c b/crypto/rsa/rsa_impl.c index 7eb1bc545..d950d502c 100644 --- a/crypto/rsa/rsa_impl.c +++ b/crypto/rsa/rsa_impl.c @@ -56,6 +56,8 @@ #include +#include + #include #include #include diff --git a/crypto/rsa/rsa_test.c b/crypto/rsa/rsa_test.c index 3a21864e1..75489e08f 100644 --- a/crypto/rsa/rsa_test.c +++ b/crypto/rsa/rsa_test.c @@ -56,6 +56,8 @@ #include +#include + #include #include #include diff --git a/crypto/stack/stack.c b/crypto/stack/stack.c index f0b31cde2..0b336ba48 100644 --- a/crypto/stack/stack.c +++ b/crypto/stack/stack.c @@ -56,6 +56,8 @@ #include +#include + #include /* kMinSize is the number of pointers that will be initially allocated in a new diff --git a/crypto/thread.c b/crypto/thread.c index 6e8d49493..f18bc1397 100644 --- a/crypto/thread.c +++ b/crypto/thread.c @@ -57,6 +57,7 @@ #include #include +#include #if defined(OPENSSL_WINDOWS) #pragma warning(push, 3) @@ -67,6 +68,7 @@ #include #include + /* lock_names contains the names of all the locks defined in thread.h. */ static const char *const lock_names[] = { "<>", "err", "ex_data", "x509", diff --git a/crypto/x509/a_strex.c b/crypto/x509/a_strex.c index 0d5dd9f58..b194d1800 100644 --- a/crypto/x509/a_strex.c +++ b/crypto/x509/a_strex.c @@ -56,6 +56,8 @@ #include +#include + #include #include #include diff --git a/crypto/x509/asn1_gen.c b/crypto/x509/asn1_gen.c index 9246b93a7..750701e43 100644 --- a/crypto/x509/asn1_gen.c +++ b/crypto/x509/asn1_gen.c @@ -56,6 +56,8 @@ #include +#include + #include #include #include diff --git a/crypto/x509/by_dir.c b/crypto/x509/by_dir.c index 659bc446a..5a77b818b 100644 --- a/crypto/x509/by_dir.c +++ b/crypto/x509/by_dir.c @@ -55,8 +55,9 @@ * copied and put under another distribution licence * [including the GNU Public Licence.] */ -#include +#include #include +#include #include #include diff --git a/crypto/x509/pkcs7_test.c b/crypto/x509/pkcs7_test.c index 2e20c40b1..4283022e0 100644 --- a/crypto/x509/pkcs7_test.c +++ b/crypto/x509/pkcs7_test.c @@ -14,6 +14,7 @@ #include #include +#include #include #include diff --git a/crypto/x509/x509_cmp.c b/crypto/x509/x509_cmp.c index 0974ef65d..712e36b21 100644 --- a/crypto/x509/x509_cmp.c +++ b/crypto/x509/x509_cmp.c @@ -55,6 +55,8 @@ * copied and put under another distribution licence * [including the GNU Public Licence.] */ +#include + #include #include #include diff --git a/crypto/x509/x509_lu.c b/crypto/x509/x509_lu.c index 05d15985c..090d341cb 100644 --- a/crypto/x509/x509_lu.c +++ b/crypto/x509/x509_lu.c @@ -55,6 +55,8 @@ * copied and put under another distribution licence * [including the GNU Public Licence.] */ +#include + #include #include #include diff --git a/crypto/x509/x509_obj.c b/crypto/x509/x509_obj.c index 5f539ab5c..914e0de38 100644 --- a/crypto/x509/x509_obj.c +++ b/crypto/x509/x509_obj.c @@ -55,6 +55,8 @@ * copied and put under another distribution licence * [including the GNU Public Licence.] */ +#include + #include #include #include diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c index 99d55bc83..285bcaf4a 100644 --- a/crypto/x509/x509_vfy.c +++ b/crypto/x509/x509_vfy.c @@ -54,6 +54,7 @@ * copied and put under another distribution licence * [including the GNU Public Licence.] */ +#include #include #include diff --git a/crypto/x509/x509_vpm.c b/crypto/x509/x509_vpm.c index 442e070b7..3daaf61b7 100644 --- a/crypto/x509/x509_vpm.c +++ b/crypto/x509/x509_vpm.c @@ -52,6 +52,8 @@ * (eay@cryptsoft.com). This product includes software written by Tim * Hudson (tjh@cryptsoft.com). */ +#include + #include #include #include @@ -61,6 +63,7 @@ #include "vpm_int.h" + /* X509_VERIFY_PARAM functions */ static void x509_verify_param_zero(X509_VERIFY_PARAM *param) diff --git a/crypto/x509/x509name.c b/crypto/x509/x509name.c index 4a5ea1758..042d18b9b 100644 --- a/crypto/x509/x509name.c +++ b/crypto/x509/x509name.c @@ -54,6 +54,8 @@ * copied and put under another distribution licence * [including the GNU Public Licence.] */ +#include + #include #include #include diff --git a/crypto/x509/x509spki.c b/crypto/x509/x509spki.c index 03823b765..9bab9573a 100644 --- a/crypto/x509/x509spki.c +++ b/crypto/x509/x509spki.c @@ -52,6 +52,8 @@ * (eay@cryptsoft.com). This product includes software written by Tim * Hudson (tjh@cryptsoft.com). */ +#include + #include #include #include diff --git a/crypto/x509/x_name.c b/crypto/x509/x_name.c index 6e108f5fa..211f68f66 100644 --- a/crypto/x509/x_name.c +++ b/crypto/x509/x_name.c @@ -55,6 +55,7 @@ * [including the GNU Public Licence.] */ #include +#include #include #include diff --git a/crypto/x509/x_pkey.c b/crypto/x509/x_pkey.c index 9fc9e3d41..550078bea 100644 --- a/crypto/x509/x_pkey.c +++ b/crypto/x509/x_pkey.c @@ -56,6 +56,8 @@ #include +#include + #include #include #include diff --git a/crypto/x509v3/pcy_tree.c b/crypto/x509v3/pcy_tree.c index a70a72b48..682474d88 100644 --- a/crypto/x509v3/pcy_tree.c +++ b/crypto/x509v3/pcy_tree.c @@ -55,6 +55,8 @@ * */ +#include + #include #include #include diff --git a/crypto/x509v3/v3_akey.c b/crypto/x509v3/v3_akey.c index 67607d963..f6e6b6909 100644 --- a/crypto/x509v3/v3_akey.c +++ b/crypto/x509v3/v3_akey.c @@ -55,6 +55,7 @@ * Hudson (tjh@cryptsoft.com). */ #include +#include #include #include diff --git a/crypto/x509v3/v3_alt.c b/crypto/x509v3/v3_alt.c index 54e0f0aef..113cf45a1 100644 --- a/crypto/x509v3/v3_alt.c +++ b/crypto/x509v3/v3_alt.c @@ -55,6 +55,7 @@ * Hudson (tjh@cryptsoft.com). */ #include +#include #include #include diff --git a/crypto/x509v3/v3_bcons.c b/crypto/x509v3/v3_bcons.c index 881b922be..a1381b4c2 100644 --- a/crypto/x509v3/v3_bcons.c +++ b/crypto/x509v3/v3_bcons.c @@ -56,6 +56,7 @@ #include +#include #include #include diff --git a/crypto/x509v3/v3_bitst.c b/crypto/x509v3/v3_bitst.c index a4c3186a8..15e985986 100644 --- a/crypto/x509v3/v3_bitst.c +++ b/crypto/x509v3/v3_bitst.c @@ -55,6 +55,7 @@ * Hudson (tjh@cryptsoft.com). */ #include +#include #include #include diff --git a/crypto/x509v3/v3_conf.c b/crypto/x509v3/v3_conf.c index 48654cb07..7606ac160 100644 --- a/crypto/x509v3/v3_conf.c +++ b/crypto/x509v3/v3_conf.c @@ -56,8 +56,9 @@ /* extension creation utilities */ -#include #include +#include +#include #include #include diff --git a/crypto/x509v3/v3_cpols.c b/crypto/x509v3/v3_cpols.c index b3d6fefa0..d5a8c3cad 100644 --- a/crypto/x509v3/v3_cpols.c +++ b/crypto/x509v3/v3_cpols.c @@ -57,6 +57,7 @@ */ #include +#include #include #include diff --git a/crypto/x509v3/v3_crld.c b/crypto/x509v3/v3_crld.c index e2bd2ad95..e41dd65a9 100644 --- a/crypto/x509v3/v3_crld.c +++ b/crypto/x509v3/v3_crld.c @@ -55,6 +55,7 @@ * Hudson (tjh@cryptsoft.com). */ #include +#include #include #include diff --git a/crypto/x509v3/v3_ia5.c b/crypto/x509v3/v3_ia5.c index 39d6ef8a8..ec57e9b1f 100644 --- a/crypto/x509v3/v3_ia5.c +++ b/crypto/x509v3/v3_ia5.c @@ -56,8 +56,8 @@ * */ - #include +#include #include #include diff --git a/crypto/x509v3/v3_info.c b/crypto/x509v3/v3_info.c index 4ef744b1c..7558b2d3b 100644 --- a/crypto/x509v3/v3_info.c +++ b/crypto/x509v3/v3_info.c @@ -57,6 +57,7 @@ */ #include +#include #include #include diff --git a/crypto/x509v3/v3_pci.c b/crypto/x509v3/v3_pci.c index 54f28e176..aa938917e 100644 --- a/crypto/x509v3/v3_pci.c +++ b/crypto/x509v3/v3_pci.c @@ -35,6 +35,7 @@ */ #include +#include #include #include diff --git a/crypto/x509v3/v3_pcons.c b/crypto/x509v3/v3_pcons.c index dac732cf9..f87c6a0bd 100644 --- a/crypto/x509v3/v3_pcons.c +++ b/crypto/x509v3/v3_pcons.c @@ -56,6 +56,7 @@ #include +#include #include #include diff --git a/crypto/x509v3/v3_purp.c b/crypto/x509v3/v3_purp.c index 791927f71..6daf632aa 100644 --- a/crypto/x509v3/v3_purp.c +++ b/crypto/x509v3/v3_purp.c @@ -56,6 +56,8 @@ #include +#include + #include #include #include diff --git a/crypto/x509v3/v3_skey.c b/crypto/x509v3/v3_skey.c index 116679aa2..471a1ab0a 100644 --- a/crypto/x509v3/v3_skey.c +++ b/crypto/x509v3/v3_skey.c @@ -56,6 +56,7 @@ #include +#include #include #include diff --git a/crypto/x509v3/v3_sxnet.c b/crypto/x509v3/v3_sxnet.c index 7b8e3c57c..bb5e214b5 100644 --- a/crypto/x509v3/v3_sxnet.c +++ b/crypto/x509v3/v3_sxnet.c @@ -57,6 +57,7 @@ */ #include +#include #include #include diff --git a/crypto/x509v3/v3_utl.c b/crypto/x509v3/v3_utl.c index b856efd9a..d081c1c27 100644 --- a/crypto/x509v3/v3_utl.c +++ b/crypto/x509v3/v3_utl.c @@ -60,6 +60,7 @@ #include #include +#include #include #include diff --git a/include/openssl/base.h b/include/openssl/base.h index c155ade65..71223a09d 100644 --- a/include/openssl/base.h +++ b/include/openssl/base.h @@ -58,7 +58,6 @@ #include #include -#include #include #include diff --git a/ssl/pqueue/pqueue.c b/ssl/pqueue/pqueue.c index 4c94355ce..ecaa13994 100644 --- a/ssl/pqueue/pqueue.c +++ b/ssl/pqueue/pqueue.c @@ -56,6 +56,8 @@ #include +#include + #include diff --git a/ssl/test/async_bio.cc b/ssl/test/async_bio.cc index 88f8e9aec..c007ffa9f 100644 --- a/ssl/test/async_bio.cc +++ b/ssl/test/async_bio.cc @@ -15,8 +15,11 @@ #include "async_bio.h" #include +#include + #include + namespace { extern const BIO_METHOD async_bio_method; diff --git a/ssl/test/bssl_shim.cc b/ssl/test/bssl_shim.cc index 19355afdc..37891b99d 100644 --- a/ssl/test/bssl_shim.cc +++ b/ssl/test/bssl_shim.cc @@ -22,6 +22,7 @@ #include #endif +#include #include #include diff --git a/ssl/test/packeted_bio.cc b/ssl/test/packeted_bio.cc index 3894d85e3..93b216415 100644 --- a/ssl/test/packeted_bio.cc +++ b/ssl/test/packeted_bio.cc @@ -16,8 +16,11 @@ #include #include +#include + #include + namespace { extern const BIO_METHOD packeted_bio_method; diff --git a/tool/digest.cc b/tool/digest.cc index e75b168c4..f95f4120d 100644 --- a/tool/digest.cc +++ b/tool/digest.cc @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -42,6 +43,7 @@ typedef int ssize_t; #include + struct close_delete { void operator()(int *fd) { close(*fd); diff --git a/tool/pkcs12.cc b/tool/pkcs12.cc index fca8bb2fd..e0133e515 100644 --- a/tool/pkcs12.cc +++ b/tool/pkcs12.cc @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #if defined(OPENSSL_WINDOWS) diff --git a/tool/speed.cc b/tool/speed.cc index 411f29e4f..2df6f9014 100644 --- a/tool/speed.cc +++ b/tool/speed.cc @@ -18,6 +18,7 @@ #include #include +#include #include #include @@ -34,6 +35,7 @@ #include #endif + extern "C" { // These values are DER encoded, RSA private keys. extern const uint8_t kDERRSAPrivate2048[]; diff --git a/tool/transport_common.cc b/tool/transport_common.cc index 453ff5e3e..c05742e59 100644 --- a/tool/transport_common.cc +++ b/tool/transport_common.cc @@ -19,6 +19,7 @@ #include #include +#include #include #if !defined(OPENSSL_WINDOWS)