Move e_os.h to be the very first include.

cryptilib.h is the second. Reviewed-by: Andy Polyakov <[email protected]> Reviewed-by: Richard Levitte <[email protected]> (Merged from openssl#4188)
yhwang · Aug 29, 2017 · 07016a8 · 07016a8
1 parent 9590da2
commit 07016a8
Show file tree

Hide file tree

Showing 39 changed files with 43 additions and 59 deletions.
diff --git a/apps/apps.h b/apps/apps.h
@@ -10,8 +10,8 @@
 #ifndef HEADER_APPS_H
 # define HEADER_APPS_H
 
-# include "internal/nelem.h"
 # include "e_os.h"
+# include "internal/nelem.h"
 # if defined(__unix) || defined(__unix__)
 #  include <sys/time.h> /* struct timeval for DTLS */
 # endif

diff --git a/apps/s_client.c b/apps/s_client.c
@@ -8,12 +8,12 @@
  * https://www.openssl.org/source/license.html
  */
 
+#include "e_os.h"
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include "e_os.h"
 #include <openssl/e_os2.h>
 
 #ifndef OPENSSL_NO_SOCK

diff --git a/crypto/bio/bss_bio.c b/crypto/bio/bss_bio.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-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,6 +15,7 @@
  * See ssl/ssltest.c for some hints on how this can be used.
  */
 
+#include "e_os.h"
 #include <assert.h>
 #include <limits.h>
 #include <stdlib.h>
@@ -24,8 +25,6 @@
 #include <openssl/err.h>
 #include <openssl/crypto.h>
 
-#include "e_os.h"
-
 static int bio_new(BIO *bio);
 static int bio_free(BIO *bio);
 static int bio_read(BIO *bio, char *buf, int size);

diff --git a/crypto/blake2/blake2b.c b/crypto/blake2/blake2b.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
@@ -17,7 +17,6 @@
 #include <assert.h>
 #include <string.h>
 #include <openssl/crypto.h>
-#include "e_os.h"
 
 #include "blake2_locl.h"
 #include "blake2_impl.h"

diff --git a/crypto/blake2/blake2s.c b/crypto/blake2/blake2s.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
@@ -17,7 +17,6 @@
 #include <assert.h>
 #include <string.h>
 #include <openssl/crypto.h>
-#include "e_os.h"
 
 #include "blake2_locl.h"
 #include "blake2_impl.h"

diff --git a/crypto/conf/conf_api.c b/crypto/conf/conf_api.c
@@ -9,11 +9,11 @@
 
 /* Part of the code in here was originally in conf.c, which is now removed */
 
+#include "e_os.h"
 #include <stdlib.h>
 #include <string.h>
 #include <openssl/conf.h>
 #include <openssl/conf_api.h>
-#include "e_os.h"
 
 static void value_free_hash(const CONF_VALUE *a, LHASH_OF(CONF_VALUE) *conf);
 static void value_free_stack_doall(CONF_VALUE *a);

diff --git a/crypto/conf/conf_lib.c b/crypto/conf/conf_lib.c
@@ -7,6 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
+#include "e_os.h"
 #include <stdio.h>
 #include <string.h>
 #include "internal/conf.h"
@@ -15,7 +16,6 @@
 #include <openssl/conf.h>
 #include <openssl/conf_api.h>
 #include <openssl/lhash.h>
-#include "e_os.h"
 
 static CONF_METHOD *default_CONF_method = NULL;
 

diff --git a/crypto/conf/conf_mod.c b/crypto/conf/conf_mod.c
@@ -7,11 +7,10 @@
  * https://www.openssl.org/source/license.html
  */
 
+#include "internal/cryptlib.h"
 #include <stdio.h>
 #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
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "internal/cryptlib_int.h"
 #include "e_os.h"
+#include "internal/cryptlib_int.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
@@ -8,7 +8,6 @@
  */
 
 #include "des_locl.h"
-#include "e_os.h"
 
 /*
  * The input and output encrypted as though 64bit cfb mode is being used.

diff --git a/crypto/dllmain.c b/crypto/dllmain.c
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "internal/cryptlib_int.h"
 #include "e_os.h"
+#include "internal/cryptlib_int.h"
 
 #if defined(_WIN32) || defined(__CYGWIN__)
 # ifdef __CYGWIN__

diff --git a/crypto/engine/eng_devcrypto.c b/crypto/engine/eng_devcrypto.c
@@ -7,6 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
+#include "e_os.h"
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -15,8 +16,6 @@
 #include <unistd.h>
 #include <assert.h>
 
-#include "e_os.h"
-
 #include <openssl/evp.h>
 #include <openssl/err.h>
 #include <openssl/engine.h>

diff --git a/crypto/engine/eng_init.c b/crypto/engine/eng_init.c
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "eng_int.h"
 #include "e_os.h"
+#include "eng_int.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
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "eng_int.h"
 #include "e_os.h"
+#include "eng_int.h"
 #include <openssl/rand.h>
 #include "internal/refcount.h"
 

diff --git a/crypto/engine/tb_asnmth.c b/crypto/engine/tb_asnmth.c
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "eng_int.h"
 #include "e_os.h"
+#include "eng_int.h"
 #include <openssl/evp.h>
 #include "internal/asn1_int.h"
 

diff --git a/crypto/init.c b/crypto/init.c
@@ -7,6 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
+#include "e_os.h"
 #include "internal/cryptlib_int.h"
 #include <openssl/err.h>
 #include "internal/rand_int.h"
@@ -25,7 +26,6 @@
 #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
@@ -7,13 +7,13 @@
  * https://www.openssl.org/source/license.html
  */
 
+#include "e_os.h"
+#include "internal/cryptlib.h"
+#include "internal/cryptlib_int.h"
 #include <stdio.h>
 #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
 # include <execinfo.h>
 #endif

diff --git a/crypto/mem_sec.c b/crypto/mem_sec.c
@@ -15,8 +15,8 @@
  * For details on that implementation, see below (look for uppercase
  * "SECURE HEAP IMPLEMENTATION").
  */
-#include <openssl/crypto.h>
 #include "e_os.h"
+#include <openssl/crypto.h>
 
 #include <string.h>
 

diff --git a/crypto/o_dir.c b/crypto/o_dir.c
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include <errno.h>
 #include "e_os.h"
+#include <errno.h>
 
 /*
  * The routines really come from the Levitte Programming, so to make life

diff --git a/crypto/o_str.c b/crypto/o_str.c
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include <limits.h>
 #include "e_os.h"
+#include <limits.h>
 #include <openssl/crypto.h>
 #include "internal/cryptlib.h"
 #include "internal/o_str.h"

diff --git a/crypto/ocsp/ocsp_ht.c b/crypto/ocsp/ocsp_ht.c
@@ -7,11 +7,11 @@
  * https://www.openssl.org/source/license.html
  */
 
+#include "e_os.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include "internal/ctype.h"
 #include <string.h>
-#include "e_os.h"
 #include <openssl/asn1.h>
 #include <openssl/ocsp.h>
 #include <openssl/err.h>

diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c
@@ -7,9 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include <stdio.h>
-
 #include "e_os.h"
+#include <stdio.h>
 #include "internal/cryptlib.h"
 #include <openssl/rand.h>
 #include "rand_lcl.h"

diff --git a/crypto/store/loader_file.c b/crypto/store/loader_file.c
@@ -7,6 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
+#include "e_os.h"
 #include <string.h>
 #include <sys/stat.h>
 #include <assert.h>
@@ -29,8 +30,6 @@
 #include "internal/store_int.h"
 #include "store_locl.h"
 
-#include "e_os.h"
-
 #ifdef _WIN32
 # define stat    _stat
 #endif

diff --git a/crypto/store/store_lib.c b/crypto/store/store_lib.c
@@ -7,11 +7,9 @@
  * https://www.openssl.org/source/license.html
  */
 
+#include "e_os.h"
 #include <stdlib.h>
 #include <string.h>
-
-#include "e_os.h"
-
 #include <openssl/crypto.h>
 #include <openssl/err.h>
 #include <openssl/store.h>

diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c
@@ -7,10 +7,10 @@
  * https://www.openssl.org/source/license.html
  */
 
+#include "e_os.h"
 #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
@@ -7,14 +7,13 @@
  * https://www.openssl.org/source/license.html
  */
 
+#include "e_os.h"
+#include "internal/cryptlib.h"
 #include <stdio.h>
 #include <time.h>
 #include <errno.h>
 #include <sys/types.h>
 
-#include "internal/cryptlib.h"
-#include "e_os.h"
-
 #ifndef OPENSSL_NO_POSIX_IO
 # include <sys/stat.h>
 #endif

diff --git a/crypto/x509v3/v3_ncons.c b/crypto/x509v3/v3_ncons.c
@@ -8,9 +8,8 @@
  */
 
 #include "e_os.h"               /* for strncasecmp */
-#include <stdio.h>
 #include "internal/cryptlib.h"
-#include "e_os.h"
+#include <stdio.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
@@ -7,9 +7,9 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include <stdio.h>
-#include "internal/cryptlib.h"
 #include "e_os.h"
+#include "internal/cryptlib.h"
+#include <stdio.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
@@ -9,10 +9,10 @@
 
 /* X509 v3 extension utilities */
 
+#include "e_os.h"
+#include "internal/cryptlib.h"
 #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/e_os.h b/e_os.h
@@ -10,6 +10,7 @@
 #ifndef HEADER_E_OS_H
 # define HEADER_E_OS_H
 
+# include <limits.h>
 # include <openssl/opensslconf.h>
 
 # include <openssl/e_os2.h>

diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c
@@ -7,11 +7,11 @@
  * https://www.openssl.org/source/license.html
  */
 
+#include "e_os.h"
 #include <stdio.h>
 #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>
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,6 @@ @@
      */
     #include "des_locl.h"
-    #include "e_os.h"
     /*
      * The input and output encrypted as though 64bit cfb mode is being used.
@@ Expand Down @@