e_os.h removal from other headers and source files.

Removed e_os.h from all bar three headers (apps/apps.h crypto/bio/bio_lcl.h and
ssl/ssl_locl.h).

Added e_os.h into the files that need it now.

Directly reference internal/nelem.h when required.

Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4188)

diff --git a/apps/apps.h b/apps/apps.h
index fdf316a08e9e0609329b5f768de3464fa7f29f13..bbc9a5ad8fc789db7607d59a244337fdd9745ec7 100644 (file)
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -10,6 +10,7 @@
 #ifndef HEADER_APPS_H
 # define HEADER_APPS_H
 
+# include "internal/nelem.h"
 # include "e_os.h"
 # if defined(__unix) || defined(__unix__)
 #  include <sys/time.h> /* struct timeval for DTLS */

diff --git a/crypto/asn1/ameth_lib.c b/crypto/asn1/ameth_lib.c
index c677917c2f59849da0e4a06dc4ad3a9410f1b5b8..82868e136668ef931ae1b74c15582f9de1d7d4f4 100644 (file)
--- a/crypto/asn1/ameth_lib.c
+++ b/crypto/asn1/ameth_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2006-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -7,8 +7,9 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include <stdio.h>
+#include "e_os.h"               /* for strncasecmp */
 #include "internal/cryptlib.h"
+#include <stdio.h>
 #include <openssl/asn1t.h>
 #include <openssl/x509.h>
 #include <openssl/engine.h>

diff --git a/crypto/asn1/tasn_utl.c b/crypto/asn1/tasn_utl.c
index 9fc4cc264232b6f85d3375cd8308d9e59a046558..5f7e4fbde2e22f08cd00e95901d7d78042d1cd88 100644 (file)
--- a/crypto/asn1/tasn_utl.c
+++ b/crypto/asn1/tasn_utl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -10,6 +10,7 @@
 #include <stddef.h>
 #include <string.h>
 #include "internal/cryptlib.h"
+#include "e_os.h"
 #include <openssl/asn1.h>
 #include <openssl/asn1t.h>
 #include <openssl/objects.h>

diff --git a/crypto/async/arch/async_posix.h b/crypto/async/arch/async_posix.h
index 3c61f7f7b0818de8654fa12fedd4f3a914d1a19c..4d88bd199392586199104006a1c70acdd39f5098 100644 (file)
--- a/crypto/async/arch/async_posix.h
+++ b/crypto/async/arch/async_posix.h
@@ -26,7 +26,6 @@
 
 #  include <ucontext.h>
 #  include <setjmp.h>
-#  include "e_os.h"
 
 typedef struct async_fibre_st {
     ucontext_t fibre;

diff --git a/crypto/blake2/blake2_impl.h b/crypto/blake2/blake2_impl.h
index 8fe5c9591505942a258e169c5876d75f0d4e84fc..80b717e79c08ab4ae9dd5163c13c0cdc58ec9a6d 100644 (file)
--- a/crypto/blake2/blake2_impl.h
+++ b/crypto/blake2/blake2_impl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -15,7 +15,6 @@
  */
 
 #include <string.h>
-#include "e_os.h"
 
 static ossl_inline uint32_t load32(const uint8_t *src)
 {

diff --git a/crypto/blake2/blake2_locl.h b/crypto/blake2/blake2_locl.h
index fb7beb976c2f19e2487b8b54b69236e4c5ca5db6..926bae944c174ca5ffe30d43d2b71ddae1d56988 100644 (file)
--- a/crypto/blake2/blake2_locl.h
+++ b/crypto/blake2/blake2_locl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -15,7 +15,6 @@
  */
 
 #include <stddef.h>
-#include "e_os.h"
 
 #define BLAKE2S_BLOCKBYTES    64
 #define BLAKE2S_OUTBYTES      32

diff --git a/crypto/bn/bn_dh.c b/crypto/bn/bn_dh.c
index 17d05597b3fc349823840843bf9e8ccb5d44ad78..75d69151a1445acebddf4b6e5de73df87868356c 100644 (file)
--- a/crypto/bn/bn_dh.c
+++ b/crypto/bn/bn_dh.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -8,7 +8,7 @@
  */
 
 #include "bn_lcl.h"
-#include "e_os.h"
+#include "internal/nelem.h"
 
 #ifndef OPENSSL_NO_DH
 #include <openssl/dh.h>

diff --git a/crypto/bn/bn_srp.c b/crypto/bn/bn_srp.c
index a68a4ac49f9678c84736f83cb2a96534e87cfc1e..27b6ebe518ea88aaf16afbdf41e0e8499751908f 100644 (file)
--- a/crypto/bn/bn_srp.c
+++ b/crypto/bn/bn_srp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -8,7 +8,7 @@
  */
 
 #include "bn_lcl.h"
-#include "e_os.h"
+#include "internal/nelem.h"
 
 #ifndef OPENSSL_NO_SRP
 

diff --git a/crypto/cast/cast_lcl.h b/crypto/cast/cast_lcl.h
index e8cf322d430dc82cc41e5eb2dcbb58b06451ba0e..35e89930a8c02963c8119182a80b67de7c58a47c 100644 (file)
--- a/crypto/cast/cast_lcl.h
+++ b/crypto/cast/cast_lcl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -7,8 +7,6 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "e_os.h"
-
 #ifdef OPENSSL_SYS_WIN32
 # include <stdlib.h>
 #endif

diff --git a/crypto/conf/conf_mod.c b/crypto/conf/conf_mod.c
index 932c69d7b7d29406da9f7228bbdfcfd2d4517996..da591cba6366e22a5373afa30a16592e0299dbc3 100644 (file)
--- a/crypto/conf/conf_mod.c
+++ b/crypto/conf/conf_mod.c
@@ -11,6 +11,7 @@
 #include <ctype.h>
 #include <openssl/crypto.h>
 #include "internal/cryptlib.h"
+#include "e_os.h"
 #include "internal/conf.h"
 #include "internal/dso.h"
 #include <openssl/x509.h>

diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index 4fe6a451406ce97c9d6edbd49cd1e6d0ef2853d9..bafcaab9668bee14818e1b766e3af5c3ad1c2925 100644 (file)
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1998-2017 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
@@ -9,6 +9,7 @@
  */
 
 #include "internal/cryptlib_int.h"
+#include "e_os.h"
 #include <openssl/safestack.h>
 
 #if     defined(__i386)   || defined(__i386__)   || defined(_M_IX86) || \

diff --git a/crypto/des/cfb64ede.c b/crypto/des/cfb64ede.c
index 5edb979e1069eed1fb20845d34d548d28a13cac6..7017fd96ff47a5d762c759064d7c1d98a0daf8a1 100644 (file)
--- a/crypto/des/cfb64ede.c
+++ b/crypto/des/cfb64ede.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy

diff --git a/crypto/dh/dh_lib.c b/crypto/dh/dh_lib.c
index f22bcf07062b457585505962e86065225a7946a5..9e8877e2d7a66602588f0dad5dd63c1b24760199 100644 (file)
--- a/crypto/dh/dh_lib.c
+++ b/crypto/dh/dh_lib.c
@@ -9,6 +9,7 @@
 
 #include <stdio.h>
 #include "internal/cryptlib.h"
+#include "e_os.h"
 #include <openssl/bn.h>
 #include "dh_locl.h"
 #include <openssl/engine.h>

diff --git a/crypto/dllmain.c b/crypto/dllmain.c
index 91904aad983b5aabdad876fc07103936ccd3f3f6..376a34165a0c9f43a6d8efbdf2240f0d256107a4 100644 (file)
--- a/crypto/dllmain.c
+++ b/crypto/dllmain.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -8,6 +8,7 @@
  */
 
 #include "internal/cryptlib_int.h"
+#include "e_os.h"
 
 #if defined(_WIN32) || defined(__CYGWIN__)
 # ifdef __CYGWIN__

diff --git a/crypto/dsa/dsa_lib.c b/crypto/dsa/dsa_lib.c
index c90d09b0f06f9a4ca2fc58af85872ca4a875a919..efd98c21cf43ddea3f5f58658d8891f9585771d5 100644 (file)
--- a/crypto/dsa/dsa_lib.c
+++ b/crypto/dsa/dsa_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -11,6 +11,7 @@
 
 #include <stdio.h>
 #include "internal/cryptlib.h"
+#include "e_os.h"
 #include <openssl/bn.h>
 #include "dsa_locl.h"
 #include <openssl/asn1.h>

diff --git a/crypto/dso/dso_lib.c b/crypto/dso/dso_lib.c
index ec3c59ac4d222293dbd0cf5412c1e81f2bf85e28..3645c8d603ae21e20c2ee0d151b517fdc1f2847d 100644 (file)
--- a/crypto/dso/dso_lib.c
+++ b/crypto/dso/dso_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -8,6 +8,7 @@
  */
 
 #include "dso_locl.h"
+#include "e_os.h"
 
 static DSO_METHOD *default_DSO_meth = NULL;
 

diff --git a/crypto/dso/dso_win32.c b/crypto/dso/dso_win32.c
index 829f1b859b0195e4adb6e871618f9825347721bc..635974be7017f9e18752b25d159d16b24b8c0b26 100644 (file)
--- a/crypto/dso/dso_win32.c
+++ b/crypto/dso/dso_win32.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -7,6 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
+#include "e_os.h"
 #include "dso_locl.h"
 
 #if defined(DSO_WIN32)

diff --git a/crypto/ec/ec_asn1.c b/crypto/ec/ec_asn1.c
index d57f3b4649575111e18170502426ca494f857f3a..5e3fbe82e759cc20e021baec19a11957e410bd1b 100644 (file)
--- a/crypto/ec/ec_asn1.c
+++ b/crypto/ec/ec_asn1.c
@@ -12,6 +12,7 @@
 #include <openssl/err.h>
 #include <openssl/asn1t.h>
 #include <openssl/objects.h>
+#include "internal/nelem.h"
 
 int EC_GROUP_get_basis_type(const EC_GROUP *group)
 {

diff --git a/crypto/ec/ec_curve.c b/crypto/ec/ec_curve.c
index b9eb9939c49c415963ed9e075344174fc1aa0ce2..99288fe59cea8d706627f26b9c0e829e41cd6a37 100644 (file)
--- a/crypto/ec/ec_curve.c
+++ b/crypto/ec/ec_curve.c
@@ -13,7 +13,7 @@
 #include <openssl/err.h>
 #include <openssl/obj_mac.h>
 #include <openssl/opensslconf.h>
-#include "e_os.h"
+#include "internal/nelem.h"
 
 typedef struct {
     int field_type,             /* either NID_X9_62_prime_field or

diff --git a/crypto/ec/ec_key.c b/crypto/ec/ec_key.c
index 6aa204eed09b2554cfeaa3af2067a29d6444d9e8..882c88229694b9fcc36a95c8c3ac875746c5e453 100644 (file)
--- a/crypto/ec/ec_key.c
+++ b/crypto/ec/ec_key.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2002-2017 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
@@ -11,6 +11,7 @@
 #include "internal/cryptlib.h"
 #include <string.h>
 #include "ec_lcl.h"
+#include "e_os.h"
 #include <openssl/err.h>
 #include <openssl/engine.h>
 

diff --git a/crypto/ec/ec_lcl.h b/crypto/ec/ec_lcl.h
index 4b65c325af72d609687fe6adfee81ab971e80362..6cc0190aa7f8dba950280a187a151cc428cadef1 100644 (file)
--- a/crypto/ec/ec_lcl.h
+++ b/crypto/ec/ec_lcl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-2017 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
@@ -15,8 +15,6 @@
 #include <openssl/bn.h>
 #include "internal/refcount.h"
 
-#include "e_os.h"
-
 #if defined(__SUNPRO_C)
 # if __SUNPRO_C >= 0x520
 #  pragma error_messages (off,E_ARRAY_OF_INCOMPLETE_NONAME,E_ARRAY_OF_INCOMPLETE)

diff --git a/crypto/ec/ec_mult.c b/crypto/ec/ec_mult.c
index 308cb52d495e0bf9ff20e038a853992ea7cb7d6f..6f75416425240549cdf834b62312450c0994a963 100644 (file)
--- a/crypto/ec/ec_mult.c
+++ b/crypto/ec/ec_mult.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-2017 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
@@ -14,6 +14,7 @@
 #include "internal/cryptlib.h"
 #include "internal/bn_int.h"
 #include "ec_lcl.h"
+#include "e_os.h"
 
 /*
  * This file implements the wNAF-based interleaving multi-exponentiation method

diff --git a/crypto/ec/ecp_nistz256.c b/crypto/ec/ecp_nistz256.c
index 16557d77f2ef32a4c4dbd12140ef005fea6e5b88..edea1f8810c30d1abd87944621ca18ba4ddad1b9 100644 (file)
--- a/crypto/ec/ecp_nistz256.c
+++ b/crypto/ec/ecp_nistz256.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2014, Intel Corporation. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
@@ -21,6 +21,7 @@
 #include "internal/cryptlib.h"
 #include "internal/bn_int.h"
 #include "ec_lcl.h"
+#include "e_os.h"
 
 #if BN_BITS2 != 64
 # define TOBN(hi,lo)    lo,hi

diff --git a/crypto/engine/eng_init.c b/crypto/engine/eng_init.c
index 8be7c6fc8658b69d0997db69545bce35bf3e1dfe..3d5eaa14e4ea07a47b78575a7767f98a256b1df0 100644 (file)
--- a/crypto/engine/eng_init.c
+++ b/crypto/engine/eng_init.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -8,6 +8,7 @@
  */
 
 #include "eng_int.h"
+#include "e_os.h"
 
 /*
  * Initialise a engine type for use (or up its functional reference count if

diff --git a/crypto/engine/eng_lib.c b/crypto/engine/eng_lib.c
index 6f422bd77e8a3675a780a3bb78aab36910c8c862..51998340a9408c0e00626ada16fff376e9bbe34f 100644 (file)
--- a/crypto/engine/eng_lib.c
+++ b/crypto/engine/eng_lib.c
@@ -8,6 +8,7 @@
  */
 
 #include "eng_int.h"
+#include "e_os.h"
 #include <openssl/rand.h>
 #include "internal/refcount.h"
 

diff --git a/crypto/engine/tb_asnmth.c b/crypto/engine/tb_asnmth.c
index 480267daabad91ed1ab65dfc0916d87e1da485c0..ca3727e90227d42485e1a1f8a0a131f97ce17f64 100644 (file)
--- a/crypto/engine/tb_asnmth.c
+++ b/crypto/engine/tb_asnmth.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2006-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -8,6 +8,7 @@
  */
 
 #include "eng_int.h"
+#include "e_os.h"
 #include <openssl/evp.h>
 #include "internal/asn1_int.h"
 

diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c
index b5e5206778ffd2d5d1c13e6c0b805ce7b2fc2314..266d8ca47b9f6205d9d431deaf7a53eb2865b8a5 100644 (file)
--- a/crypto/evp/p_lib.c
+++ b/crypto/evp/p_lib.c
@@ -9,6 +9,7 @@
 
 #include <stdio.h>
 #include "internal/cryptlib.h"
+#include "e_os.h"
 #include <openssl/bn.h>
 #include <openssl/err.h>
 #include <openssl/objects.h>

diff --git a/crypto/init.c b/crypto/init.c
index ccfd003bb630c1dfc11169394ce1a8753e5eb10f..fa68a29b2c2515855d8e3fec59f3b30cc963ac7f 100644 (file)
--- a/crypto/init.c
+++ b/crypto/init.c
@@ -25,6 +25,7 @@
 #include "internal/thread_once.h"
 #include "internal/dso.h"
 #include "internal/store.h"
+#include "e_os.h"
 
 static int stopped = 0;
 

diff --git a/crypto/mem.c b/crypto/mem.c
index 947c50ed21dcbb4c5da9c280cb6da0bc23762d05..2713b833c0b5691de7a328a8f01856fd724338ec 100644 (file)
--- a/crypto/mem.c
+++ b/crypto/mem.c
@@ -11,6 +11,7 @@
 #include <stdlib.h>
 #include <limits.h>
 #include <openssl/crypto.h>
+#include "e_os.h"
 #include "internal/cryptlib.h"
 #include "internal/cryptlib_int.h"
 #ifndef OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE

diff --git a/crypto/objects/obj_xref.c b/crypto/objects/obj_xref.c
index 9a558a24cd970de5cf6fe83d60218efe18faf738..05a5c86217e7e26ba1c39b22839b124e8c491027 100644 (file)
--- a/crypto/objects/obj_xref.c
+++ b/crypto/objects/obj_xref.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2006-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -9,7 +9,7 @@
 
 #include <openssl/objects.h>
 #include "obj_xref.h"
-#include "e_os.h"
+#include "internal/nelem.h"
 
 static STACK_OF(nid_triple) *sig_app, *sigx_app;
 

diff --git a/crypto/rsa/rsa_lib.c b/crypto/rsa/rsa_lib.c
index 7a1d81c206d42d206974f97baf2c2ccb7603a64d..92d872886b2076ebd1af978f024a2ffe7621ecae 100644 (file)
--- a/crypto/rsa/rsa_lib.c
+++ b/crypto/rsa/rsa_lib.c
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <openssl/crypto.h>
 #include "internal/cryptlib.h"
+#include "e_os.h"
 #include <openssl/lhash.h>
 #include "internal/bn_int.h"
 #include <openssl/engine.h>

diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c
index 977c7ad2b9ed033ada0161881b8a05dbd0746990..cff1a840abe14909981a4697fefd6449f658aa17 100644 (file)
--- a/crypto/ui/ui_openssl.c
+++ b/crypto/ui/ui_openssl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -10,6 +10,7 @@
 #include <openssl/e_os2.h>
 #include <openssl/err.h>
 #include <openssl/ui.h>
+#include "e_os.h"
 
 #ifndef OPENSSL_NO_UI_CONSOLE
 /*

diff --git a/crypto/x509/by_dir.c b/crypto/x509/by_dir.c
index d8142977a86fe9db6389b685993cadb4ffa4c902..335c3b3dda23fd146d66e902478f2c2ef0fbb8eb 100644 (file)
--- a/crypto/x509/by_dir.c
+++ b/crypto/x509/by_dir.c
@@ -13,6 +13,7 @@
 #include <sys/types.h>
 
 #include "internal/cryptlib.h"
+#include "e_os.h"
 
 #ifndef OPENSSL_NO_POSIX_IO
 # include <sys/stat.h>

diff --git a/crypto/x509/x509_lu.c b/crypto/x509/x509_lu.c
index e64fda24f405b112e1b4ef053cbce869440aa4fc..7d915aa76245c42ccd7b23cf222a35537114f39f 100644 (file)
--- a/crypto/x509/x509_lu.c
+++ b/crypto/x509/x509_lu.c
@@ -9,6 +9,7 @@
 
 #include <stdio.h>
 #include "internal/cryptlib.h"
+#include "e_os.h"
 #include <openssl/lhash.h>
 #include <openssl/x509.h>
 #include "internal/x509_int.h"

diff --git a/crypto/x509/x509_set.c b/crypto/x509/x509_set.c
index 08b71ff58212968203bd49d318394a09a9e04464..49f8651e9a6acbc94427931917dcabe266d2df8b 100644 (file)
--- a/crypto/x509/x509_set.c
+++ b/crypto/x509/x509_set.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -9,6 +9,7 @@
 
 #include <stdio.h>
 #include "internal/cryptlib.h"
+#include "e_os.h"
 #include <openssl/asn1.h>
 #include <openssl/objects.h>
 #include <openssl/evp.h>

diff --git a/crypto/x509/x509cset.c b/crypto/x509/x509cset.c
index 3c9c32296e533442c0a8f418d5838625c2038a94..63ad319181d9e4246641df0c68d453c637dadb44 100644 (file)
--- a/crypto/x509/x509cset.c
+++ b/crypto/x509/x509cset.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -9,6 +9,7 @@
 
 #include <stdio.h>
 #include "internal/cryptlib.h"
+#include "e_os.h"
 #include <openssl/asn1.h>
 #include <openssl/objects.h>
 #include <openssl/evp.h>

diff --git a/crypto/x509v3/v3_ncons.c b/crypto/x509v3/v3_ncons.c
index 36ff966a36bb4de61c5b52f48846b8b4bb84d6d8..3b9145b15e0b87643bddf561cea229d0b1e4991b 100644 (file)
--- a/crypto/x509v3/v3_ncons.c
+++ b/crypto/x509v3/v3_ncons.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2003-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -7,8 +7,10 @@
  * https://www.openssl.org/source/license.html
  */
 
+#include "e_os.h"               /* for strncasecmp */
 #include <stdio.h>
 #include "internal/cryptlib.h"
+#include "e_os.h"
 #include "internal/asn1_int.h"
 #include <openssl/asn1t.h>
 #include <openssl/conf.h>

diff --git a/crypto/x509v3/v3_tlsf.c b/crypto/x509v3/v3_tlsf.c
index fec67243f8d38d3b5e8a631bd0e2fade8a9bbf84..8e5daf9d1580689c91a71b43ea133799eb859363 100644 (file)
--- a/crypto/x509v3/v3_tlsf.c
+++ b/crypto/x509v3/v3_tlsf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2015-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -9,6 +9,7 @@
 
 #include <stdio.h>
 #include "internal/cryptlib.h"
+#include "e_os.h"
 #include "internal/o_str.h"
 #include <openssl/asn1t.h>
 #include <openssl/conf.h>

diff --git a/crypto/x509v3/v3_utl.c b/crypto/x509v3/v3_utl.c
index a10722cf16a86e89e9aa4ac203cb0021f7e26ac0..b58fac5fd05d46c37f80016e49a32b748d8ebd6c 100644 (file)
--- a/crypto/x509v3/v3_utl.c
+++ b/crypto/x509v3/v3_utl.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include "internal/ctype.h"
 #include "internal/cryptlib.h"
+#include "e_os.h"
 #include <openssl/conf.h>
 #include <openssl/x509v3.h>
 #include "internal/x509_int.h"

diff --git a/include/internal/cryptlib.h b/include/internal/cryptlib.h
index c73c7542424723d02a31b8b96d85a09b76a16d1b..3d348008e2355d90d5b011b9bd766285dc912092 100644 (file)
--- a/include/internal/cryptlib.h
+++ b/include/internal/cryptlib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -13,8 +13,6 @@
 # include <stdlib.h>
 # include <string.h>
 
-# include "e_os.h"
-
 # ifdef OPENSSL_USE_APPLINK
 #  undef BIO_FLAGS_UPLINK
 #  define BIO_FLAGS_UPLINK 0x8000
@@ -25,6 +23,7 @@
 # include <openssl/buffer.h>
 # include <openssl/bio.h>
 # include <openssl/err.h>
+# include "internal/nelem.h"
 
 #ifdef  __cplusplus
 extern "C" {

diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c
index dd62e0cff78d8fad422eaaa86a9ab66a702ddcf1..e4abe92ac1be4d065a4c0acf58a26880188defc3 100644 (file)
--- a/ssl/d1_lib.c
+++ b/ssl/d1_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2005-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -11,6 +11,7 @@
 #include <openssl/objects.h>
 #include <openssl/rand.h>
 #include "ssl_locl.h"
+#include "e_os.h"
 
 #if defined(OPENSSL_SYS_VXWORKS)
 # include <sys/times.h>

diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c
index d1dfb92bf8d88c0f3e322cdd09ab7e95d199ae19..aec568707f738e588ace97b40feadfd6ca3f8c1c 100644 (file)
--- a/ssl/record/rec_layer_s3.c
+++ b/ssl/record/rec_layer_s3.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index fdccdb76c4a834275a79e1c742af59372585795e..1a5c3f76b817d2dab3851079507c70b57ae2b6f8 100644 (file)
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -11,7 +11,9 @@
 
 #include <stdio.h>
 #include <openssl/objects.h>
+#include "internal/nelem.h"
 #include "ssl_locl.h"
+#include "e_os.h"
 #include <openssl/md5.h>
 #include <openssl/dh.h>
 #include <openssl/rand.h>

diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index a0dd878ef77f10cab93f48711da3e4c08058e952..ad78545f8c99ffe6795cd3d6ae7d7a0d8305948a 100644 (file)
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -11,7 +11,11 @@
 #include <stdio.h>
 #include <sys/types.h>
 
-#include "e_os.h"
+#include "internal/nelem.h"
+#ifndef NO_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
 #include "internal/o_dir.h"
 #include <openssl/lhash.h>
 #include <openssl/bio.h>
@@ -20,6 +24,7 @@
 #include <openssl/dh.h>
 #include <openssl/bn.h>
 #include <openssl/crypto.h>
+#include "e_os.h"
 #include "ssl_locl.h"
 #include "ssl_cert_table.h"
 #include "internal/thread_once.h"

diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 60e1308d540135b4992fdb1d354702bac063972b..17bd939a748453299fb5a68828954be9b60d8196 100644 (file)
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -15,6 +15,7 @@
 #include <openssl/comp.h>
 #include <openssl/engine.h>
 #include <openssl/crypto.h>
+#include "internal/nelem.h"
 #include "ssl_locl.h"
 #include "internal/thread_once.h"
 #include "internal/cryptlib.h"

diff --git a/ssl/ssl_conf.c b/ssl/ssl_conf.c
index 6dd5922a5476d8452500553a0ec18095a2aadc6a..1a8dc1543d17de54a25de717eb31e9dc2166ec29 100644 (file)
--- a/ssl/ssl_conf.c
+++ b/ssl/ssl_conf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2012-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -12,6 +12,7 @@
 #include <openssl/conf.h>
 #include <openssl/objects.h>
 #include <openssl/dh.h>
+#include "internal/nelem.h"
 
 /*
  * structure holding name tables. This is used for permitted elements in lists

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 501a12ce502056986630a487f435aa53bfa73d02..eb8603da1e80fdeba1473ddf4cde9a033d339519 100644 (file)
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  * Copyright 2005 Nokia. All rights reserved.
  *
@@ -10,6 +10,7 @@
  */
 
 #include <stdio.h>
+#include "e_os.h"
 #include "ssl_locl.h"
 #include <openssl/objects.h>
 #include <openssl/lhash.h>

diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index f14148a4381132d7af8b573c5599fdeeb871332b..72f48752e97651736faee487b9a320ac93460460 100644 (file)
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -16,7 +16,7 @@
 # include <string.h>
 # include <errno.h>
 
-# include "e_os.h"
+# include "e_os.h"              /* struct timeval for Windows */
 # if defined(__unix) || defined(__unix__)
 #  include <sys/time.h>         /* struct timeval for DTLS */
 # endif

diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
index efba7077ae9e8e64c21f7ec35022a740599694c0..ea5309e8195bdb75f77346558ee3c66010f0dfcd 100644 (file)
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright 2005 Nokia. All rights reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
@@ -12,6 +12,7 @@
 #include <openssl/lhash.h>
 #include <openssl/rand.h>
 #include <openssl/engine.h>
+#include "e_os.h"
 #include "ssl_locl.h"
 #include "statem/statem_locl.h"
 

diff --git a/ssl/statem/extensions.c b/ssl/statem/extensions.c
index d569f6c2519aed35663d60000487d768d3df3c8c..c435405e4d7ea5e6a9f049d0c360cf836eca97c5 100644 (file)
--- a/ssl/statem/extensions.c
+++ b/ssl/statem/extensions.c
@@ -8,6 +8,7 @@
  */
 
 #include <string.h>
+#include "internal/nelem.h"
 #include "../ssl_locl.h"
 #include "statem_locl.h"
 

diff --git a/ssl/statem/statem.c b/ssl/statem/statem.c
index 4f259fdf8e7fdbd9d262e84ba9f8afc4a9c5f492..fd48f666c0df01a102b14d9ae2fa2b1548e80215 100644 (file)
--- a/ssl/statem/statem.c
+++ b/ssl/statem/statem.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2015-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -8,6 +8,7 @@
  */
 
 #include <openssl/rand.h>
+#include "e_os.h"
 #include "../ssl_locl.h"
 #include "statem_locl.h"
 

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 02ed680225cc4886555a0c0e2bf38fd92fc00509..48c33de64bf8659064878d665abeae0db7254069 100644 (file)
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -17,6 +17,7 @@
 #include <openssl/x509v3.h>
 #include <openssl/dh.h>
 #include <openssl/bn.h>
+#include "internal/nelem.h"
 #include "ssl_locl.h"
 #include <openssl/ct.h>
 

diff --git a/test/bftest.c b/test/bftest.c
index 36029c2f7b2b61a1aab55bc09e7472644882a419..7ab3d5115f0f5837a199387dd492ced44b6224fe 100644 (file)
--- a/test/bftest.c
+++ b/test/bftest.c
@@ -19,6 +19,7 @@
 #include "testutil.h"
 
 #include "internal/nelem.h"
+
 #ifndef OPENSSL_NO_BF
 # include <openssl/blowfish.h>
 

diff --git a/test/ctype_internal_test.c b/test/ctype_internal_test.c
index ce3cbfee0a3281830c17614ce919c21e7d6537dc..9cb2321bc014ee10d47e13594f910244c253dfdc 100644 (file)
--- a/test/ctype_internal_test.c
+++ b/test/ctype_internal_test.c
@@ -9,7 +9,7 @@
 
 #include "testutil.h"
 #include "internal/ctype.h"
-#include "../e_os.h"
+#include "internal/nelem.h"
 #include <ctype.h>
 #include <stdio.h>
 

diff --git a/test/tls13encryptiontest.c b/test/tls13encryptiontest.c
index 667f9534de1e6f59ceef6ba10067ffab5c41d5c1..6e4b88985fc66912930933d36eadfd63128a7a27 100644 (file)
--- a/test/tls13encryptiontest.c
+++ b/test/tls13encryptiontest.c
@@ -22,6 +22,7 @@
 # pragma names restore
 #endif
 
+#include "internal/nelem.h"
 #include "testutil.h"
 
 /*