diff options
author | Pauli <paul.dale@oracle.com> | 2017-08-24 09:05:07 +1000 |
---|---|---|
committer | Pauli <paul.dale@oracle.com> | 2017-08-30 07:20:44 +1000 |
commit | 07016a8a3174db5caf07182930533cf88ad9b0ad (patch) | |
tree | 42dcb67fa6c72635b76590f8ab698bb4c692d838 /crypto | |
parent | 9590da2cd67ae23588568c57556d6140fb86f892 (diff) |
Move e_os.h to be the very first include.
cryptilib.h is the second.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4188)
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/bio/bss_bio.c | 5 | ||||
-rw-r--r-- | crypto/blake2/blake2b.c | 3 | ||||
-rw-r--r-- | crypto/blake2/blake2s.c | 3 | ||||
-rw-r--r-- | crypto/conf/conf_api.c | 2 | ||||
-rw-r--r-- | crypto/conf/conf_lib.c | 2 | ||||
-rw-r--r-- | crypto/conf/conf_mod.c | 3 | ||||
-rw-r--r-- | crypto/cryptlib.c | 2 | ||||
-rw-r--r-- | crypto/des/cfb64ede.c | 1 | ||||
-rw-r--r-- | crypto/dllmain.c | 2 | ||||
-rw-r--r-- | crypto/engine/eng_devcrypto.c | 3 | ||||
-rw-r--r-- | crypto/engine/eng_init.c | 2 | ||||
-rw-r--r-- | crypto/engine/eng_lib.c | 2 | ||||
-rw-r--r-- | crypto/engine/tb_asnmth.c | 2 | ||||
-rw-r--r-- | crypto/init.c | 2 | ||||
-rw-r--r-- | crypto/mem.c | 6 | ||||
-rw-r--r-- | crypto/mem_sec.c | 2 | ||||
-rw-r--r-- | crypto/o_dir.c | 2 | ||||
-rw-r--r-- | crypto/o_str.c | 2 | ||||
-rw-r--r-- | crypto/ocsp/ocsp_ht.c | 2 | ||||
-rw-r--r-- | crypto/rand/rand_unix.c | 3 | ||||
-rw-r--r-- | crypto/store/loader_file.c | 3 | ||||
-rw-r--r-- | crypto/store/store_lib.c | 4 | ||||
-rw-r--r-- | crypto/ui/ui_openssl.c | 2 | ||||
-rw-r--r-- | crypto/x509/by_dir.c | 5 | ||||
-rw-r--r-- | crypto/x509v3/v3_ncons.c | 3 | ||||
-rw-r--r-- | crypto/x509v3/v3_tlsf.c | 4 | ||||
-rw-r--r-- | crypto/x509v3/v3_utl.c | 4 |
27 files changed, 32 insertions, 44 deletions
diff --git a/crypto/bio/bss_bio.c b/crypto/bio/bss_bio.c index 9fa47600c9..e34382c557 100644 --- 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 index e77bd9ac16..829ba5b50a 100644 --- 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 index 7451b14f5a..8211374d12 100644 --- 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 index 6026dca928..6f8947df2c 100644 --- 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 index 74759c56d5..06bb3f7ff1 100644 --- 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 index da591cba63..7622d8e1f3 100644 --- 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 index bafcaab966..6e45b0d8ba 100644 --- 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 index 7017fd96ff..21943f6143 100644 --- 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 index 376a34165a..b0459c2e73 100644 --- 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 index 19781b8ab0..f2196b4e54 100644 --- 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 index 3d5eaa14e4..7c235fc472 100644 --- 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 index 51998340a9..c060a5d6ac 100644 --- 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 index ca3727e902..bc6e91ccab 100644 --- 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 index fa68a29b2c..074e683cc0 100644 --- 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 index 2713b833c0..c171ae486c 100644 --- 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 index 703ddad5e5..f8470249c3 100644 --- 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 index 459ce9c1e1..fca9c75e05 100644 --- 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 index be130ce804..cf098fc90a 100644 --- 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 index ef84a2d4c9..42c3686431 100644 --- 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 index 4f01e8aad5..08ea55fbb9 100644 --- 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 index f6cb928ae3..1c794ef826 100644 --- 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 index 6f789eb79c..2cc247d12e 100644 --- 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 index cff1a840ab..3b74e6b7e4 100644 --- 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 index 335c3b3dda..8476f0025e 100644 --- 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 index 3b9145b15e..7731bacd04 100644 --- 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 index 8e5daf9d15..5f2d5d2cf8 100644 --- 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 index b58fac5fd0..8bba5a67d2 100644 --- 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" |