ssl: rework "e_os.h" inclusions

- Remove e_os.h include from "ssl_local.h"
- Added e_os.h into the files that need it now.
- Move e_os.h to be the very first include

Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14344)

diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c
index d055f06b39942257417c90c339fc142f132406e6..4702c98be07a664ad5209fd54176b119acdc5fa0 100644 (file)
--- a/ssl/d1_lib.c
+++ b/ssl/d1_lib.c
@@ -8,6 +8,7 @@
  */
 
 #include "internal/e_os.h"
+#include "internal/e_winsock.h"          /* struct timeval for DTLS_CTRL_GET_TIMEOUT */
 #include <stdio.h>
 #include <openssl/objects.h>
 #include <openssl/rand.h>

diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c
index 14db7dab2cd777ec03797728e41ba55c835ac490..1f3b63ba2ef9a6b8116d73c291c78a1f7e656668 100644 (file)
--- a/ssl/record/rec_layer_s3.c
+++ b/ssl/record/rec_layer_s3.c
@@ -7,6 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
+#include "internal/e_os.h"
+
 #include <stdio.h>
 #include <limits.h>
 #include <errno.h>

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 86d81984a6535f7cd211254ff9f89d0432fadddf..b98464256e6c5e8871fc059e64823a830ead97b3 100644 (file)
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -9,7 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include <stdio.h>
+#include "internal/e_os.h"
+
 #include <openssl/objects.h>
 #include "internal/nelem.h"
 #include "ssl_local.h"

diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index 04d08430e7934f6c362711420d7b8a2f832db5f9..021a1a143eb93d09483bca1f59c16b37c96aab85 100644 (file)
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -8,6 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
+#include "internal/e_os.h"
+
 #include <stdio.h>
 #include <sys/types.h>
 

diff --git a/ssl/ssl_conf.c b/ssl/ssl_conf.c
index 5e2d7c1c98dbd50f114a773ef7f9ec6cd6b519a9..e6884b2b43f1083b550406d3160bc0ce519b0ca6 100644 (file)
--- a/ssl/ssl_conf.c
+++ b/ssl/ssl_conf.c
@@ -7,6 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
+#include "internal/e_os.h"
+
 #include <stdio.h>
 #include "ssl_local.h"
 #include <openssl/conf.h>

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index ba9fcec55c80bbc98767081c29100561e816bcdb..bca2b9faa5958434d742e20de3202f847a2f48bf 100644 (file)
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -9,8 +9,10 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "ssl_local.h"
 #include "internal/e_os.h"
+#include "internal/e_winsock.h"
+#include "ssl_local.h"
+
 #include <openssl/objects.h>
 #include <openssl/x509v3.h>
 #include <openssl/rand.h>

diff --git a/ssl/ssl_local.h b/ssl/ssl_local.h
index d1c1afe94e898898f68db6d62c5ec8bde27bc850..7b2dbe1bb07d3a42e1c0f54c8aed68e4243cd57e 100644 (file)
--- a/ssl/ssl_local.h
+++ b/ssl/ssl_local.h
@@ -12,7 +12,6 @@
 #ifndef OSSL_SSL_LOCAL_H
 # define OSSL_SSL_LOCAL_H
 
-# include "internal/e_os.h"              /* struct timeval for DTLS */
 # include <stdlib.h>
 # include <time.h>
 # include <errno.h>

diff --git a/ssl/statem/statem.c b/ssl/statem/statem.c
index 921d7cfb1e05df93f45664626f7b6b44e8a06422..b24ffdc15df0e1edd7c1d488f9e45004a1c24f9d 100644 (file)
--- a/ssl/statem/statem.c
+++ b/ssl/statem/statem.c
@@ -7,6 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
+#include "internal/e_os.h"
+
 #if defined(__TANDEM) && defined(_SPT_MODEL_)
 # include <spthread.h>
 # include <spt_extensions.h> /* timeval */

diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index db009f3b774a19b90ce2d1f5b367e1512285adc4..d1668cb675781342ef76545ec8f80179c277302a 100644 (file)
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -9,6 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
+#include "internal/e_os.h"
+
 #include <stdio.h>
 #include "../ssl_local.h"
 #include "statem_local.h"

diff --git a/test/helpers/ssltestlib.c b/test/helpers/ssltestlib.c
index c441199ea481d5517d63f0d4a99351a12433ecd5..07e0756803cadfe2b7721d853a34911cb214e682 100644 (file)
--- a/test/helpers/ssltestlib.c
+++ b/test/helpers/ssltestlib.c
@@ -25,6 +25,7 @@
 
 #if (!defined(OPENSSL_NO_KTLS) || !defined(OPENSSL_NO_QUIC)) && !defined(OPENSSL_NO_POSIX_IO) && !defined(OPENSSL_NO_SOCK)
 # define OSSL_USE_SOCKETS 1
+# include "internal/e_winsock.h"
 # include "internal/sockets.h"
 # include <openssl/bio.h>
 #endif