diff options
79 files changed, 99 insertions, 103 deletions
diff --git a/crypto/asn1/bio_asn1.c b/crypto/asn1/bio_asn1.c index e28ab27767..9146fb744b 100644 --- a/crypto/asn1/bio_asn1.c +++ b/crypto/asn1/bio_asn1.c @@ -14,7 +14,7 @@ */ #include <string.h> -#include <internal/bio.h> +#include "internal/bio.h" #include <openssl/asn1.h> #include "internal/cryptlib.h" diff --git a/crypto/async/async.c b/crypto/async/async.c index 8c699af78e..1359b5061a 100644 --- a/crypto/async/async.c +++ b/crypto/async/async.c @@ -19,7 +19,7 @@ #include "async_locl.h" #include <openssl/err.h> -#include <internal/cryptlib_int.h> +#include "internal/cryptlib_int.h" #include <string.h> #define ASYNC_JOB_RUNNING 0 diff --git a/crypto/async/async_locl.h b/crypto/async/async_locl.h index f0ac05a3db..d7790293f7 100644 --- a/crypto/async/async_locl.h +++ b/crypto/async/async_locl.h @@ -20,7 +20,7 @@ # include <windows.h> #endif -#include <internal/async.h> +#include "internal/async.h" #include <openssl/crypto.h> typedef struct async_ctx_st async_ctx; diff --git a/crypto/bio/b_addr.c b/crypto/bio/b_addr.c index 6d854927fe..b2cd83c392 100644 --- a/crypto/bio/b_addr.c +++ b/crypto/bio/b_addr.c @@ -16,7 +16,7 @@ #ifndef OPENSSL_NO_SOCK #include <openssl/err.h> #include <openssl/buffer.h> -#include <internal/thread_once.h> +#include "internal/thread_once.h" CRYPTO_RWLOCK *bio_lookup_lock; static CRYPTO_ONCE bio_lookup_init = CRYPTO_ONCE_STATIC_INIT; diff --git a/crypto/bio/bio_lcl.h b/crypto/bio/bio_lcl.h index f7de429cbb..337621be7f 100644 --- a/crypto/bio/bio_lcl.h +++ b/crypto/bio/bio_lcl.h @@ -87,7 +87,7 @@ union bio_addr_st { /* END BIO_ADDRINFO/BIO_ADDR stuff. */ #include "internal/cryptlib.h" -#include <internal/bio.h> +#include "internal/bio.h" typedef struct bio_f_buffer_ctx_struct { /*- diff --git a/crypto/bio/bio_meth.c b/crypto/bio/bio_meth.c index 3cbac5bf85..be6420c028 100644 --- a/crypto/bio/bio_meth.c +++ b/crypto/bio/bio_meth.c @@ -8,7 +8,7 @@ */ #include "bio_lcl.h" -#include <internal/thread_once.h> +#include "internal/thread_once.h" CRYPTO_RWLOCK *bio_type_lock = NULL; static CRYPTO_ONCE bio_type_init = CRYPTO_ONCE_STATIC_INIT; diff --git a/crypto/bn/bn_srp.c b/crypto/bn/bn_srp.c index 58b1691eee..a68a4ac49f 100644 --- a/crypto/bn/bn_srp.c +++ b/crypto/bn/bn_srp.c @@ -13,7 +13,7 @@ #ifndef OPENSSL_NO_SRP #include <openssl/srp.h> -#include <internal/bn_srp.h> +#include "internal/bn_srp.h" # if (BN_BYTES == 8) # if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__) diff --git a/crypto/conf/conf_lib.c b/crypto/conf/conf_lib.c index 3532114917..74759c56d5 100644 --- a/crypto/conf/conf_lib.c +++ b/crypto/conf/conf_lib.c @@ -9,7 +9,7 @@ #include <stdio.h> #include <string.h> -#include <internal/conf.h> +#include "internal/conf.h" #include <openssl/crypto.h> #include <openssl/err.h> #include <openssl/conf.h> diff --git a/crypto/conf/conf_sap.c b/crypto/conf/conf_sap.c index bed95abea4..0815109d81 100644 --- a/crypto/conf/conf_sap.c +++ b/crypto/conf/conf_sap.c @@ -10,7 +10,7 @@ #include <stdio.h> #include <openssl/crypto.h> #include "internal/cryptlib.h" -#include <internal/conf.h> +#include "internal/conf.h" #include <openssl/x509.h> #include <openssl/asn1.h> #include <openssl/engine.h> diff --git a/crypto/engine/eng_int.h b/crypto/engine/eng_int.h index 0af8b8f8f9..60fdf820f0 100644 --- a/crypto/engine/eng_int.h +++ b/crypto/engine/eng_int.h @@ -12,8 +12,8 @@ # define HEADER_ENGINE_INT_H # include "internal/cryptlib.h" -# include <internal/engine.h> -# include <internal/thread_once.h> +# include "internal/engine.h" +# include "internal/thread_once.h" # include "internal/refcount.h" #ifdef __cplusplus diff --git a/crypto/engine/eng_openssl.c b/crypto/engine/eng_openssl.c index dce5cccfd8..02885f4680 100644 --- a/crypto/engine/eng_openssl.c +++ b/crypto/engine/eng_openssl.c @@ -11,7 +11,7 @@ #include <stdio.h> #include <openssl/crypto.h> #include "internal/cryptlib.h" -#include <internal/engine.h> +#include "internal/engine.h" #include <openssl/pem.h> #include <openssl/evp.h> #include <openssl/rand.h> diff --git a/crypto/engine/eng_rdrand.c b/crypto/engine/eng_rdrand.c index b3defcbe4f..7be64e3fd4 100644 --- a/crypto/engine/eng_rdrand.c +++ b/crypto/engine/eng_rdrand.c @@ -11,7 +11,7 @@ #include <stdio.h> #include <string.h> -#include <internal/engine.h> +#include "internal/engine.h" #include <openssl/rand.h> #include <openssl/err.h> #include <openssl/crypto.h> diff --git a/crypto/err/err.c b/crypto/err/err.c index eec071236e..ab08435af1 100644 --- a/crypto/err/err.c +++ b/crypto/err/err.c @@ -10,16 +10,16 @@ #include <stdio.h> #include <stdarg.h> #include <string.h> -#include <internal/cryptlib_int.h> -#include <internal/err.h> -#include <internal/err_int.h> +#include "internal/cryptlib_int.h" +#include "internal/err.h" +#include "internal/err_int.h" #include <openssl/lhash.h> #include <openssl/err.h> #include <openssl/crypto.h> #include <openssl/buffer.h> #include <openssl/bio.h> #include <openssl/opensslconf.h> -#include <internal/thread_once.h> +#include "internal/thread_once.h" static int err_load_strings(const ERR_STRING_DATA *str); diff --git a/crypto/evp/c_allc.c b/crypto/evp/c_allc.c index 76edfbd37b..58a0691df7 100644 --- a/crypto/evp/c_allc.c +++ b/crypto/evp/c_allc.c @@ -10,7 +10,7 @@ #include <stdio.h> #include "internal/cryptlib.h" #include <openssl/evp.h> -#include <internal/evp_int.h> +#include "internal/evp_int.h" #include <openssl/pkcs12.h> #include <openssl/objects.h> diff --git a/crypto/evp/c_alld.c b/crypto/evp/c_alld.c index 86b2fc8584..088f65cd80 100644 --- a/crypto/evp/c_alld.c +++ b/crypto/evp/c_alld.c @@ -10,7 +10,7 @@ #include <stdio.h> #include "internal/cryptlib.h" #include <openssl/evp.h> -#include <internal/evp_int.h> +#include "internal/evp_int.h" #include <openssl/pkcs12.h> #include <openssl/objects.h> diff --git a/crypto/evp/e_rc5.c b/crypto/evp/e_rc5.c index f69ba5b2f5..a2f26d8c5f 100644 --- a/crypto/evp/e_rc5.c +++ b/crypto/evp/e_rc5.c @@ -13,7 +13,7 @@ #ifndef OPENSSL_NO_RC5 # include <openssl/evp.h> -# include <internal/evp_int.h> +# include "internal/evp_int.h" # include <openssl/objects.h> # include "evp_locl.h" # include <openssl/rc5.h> diff --git a/crypto/evp/names.c b/crypto/evp/names.c index a92be1fedf..41c3ceee3a 100644 --- a/crypto/evp/names.c +++ b/crypto/evp/names.c @@ -10,7 +10,7 @@ #include <stdio.h> #include "internal/cryptlib.h" #include <openssl/evp.h> -#include <internal/objects.h> +#include "internal/objects.h" #include <openssl/x509.h> #include "internal/evp_int.h" diff --git a/crypto/evp/pbe_scrypt.c b/crypto/evp/pbe_scrypt.c index 101bb1edbd..a52cd751f6 100644 --- a/crypto/evp/pbe_scrypt.c +++ b/crypto/evp/pbe_scrypt.c @@ -12,7 +12,7 @@ #include <string.h> #include <openssl/evp.h> #include <openssl/err.h> -#include <internal/numbers.h> +#include "internal/numbers.h" #ifndef OPENSSL_NO_SCRYPT diff --git a/crypto/init.c b/crypto/init.c index fc01c827f3..c8f0a3f1ee 100644 --- a/crypto/init.c +++ b/crypto/init.c @@ -7,24 +7,24 @@ * https://www.openssl.org/source/license.html */ -#include <internal/cryptlib_int.h> +#include "internal/cryptlib_int.h" #include <openssl/err.h> -#include <internal/rand_int.h> -#include <internal/bio.h> +#include "internal/rand_int.h" +#include "internal/bio.h" #include <openssl/evp.h> -#include <internal/evp_int.h> -#include <internal/conf.h> -#include <internal/async.h> -#include <internal/engine.h> -#include <internal/comp.h> -#include <internal/err.h> -#include <internal/err_int.h> -#include <internal/objects.h> +#include "internal/evp_int.h" +#include "internal/conf.h" +#include "internal/async.h" +#include "internal/engine.h" +#include "internal/comp.h" +#include "internal/err.h" +#include "internal/err_int.h" +#include "internal/objects.h" #include <stdlib.h> #include <assert.h> -#include <internal/thread_once.h> -#include <internal/dso.h> -#include <internal/store.h> +#include "internal/thread_once.h" +#include "internal/dso.h" +#include "internal/store.h" static int stopped = 0; diff --git a/crypto/objects/o_names.c b/crypto/objects/o_names.c index cf96c56779..73676445c1 100644 --- a/crypto/objects/o_names.c +++ b/crypto/objects/o_names.c @@ -16,7 +16,7 @@ #include <openssl/objects.h> #include <openssl/safestack.h> #include <openssl/e_os2.h> -#include <internal/thread_once.h> +#include "internal/thread_once.h" #include "obj_lcl.h" /* diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c index 58f88ba4fa..fd297e2082 100644 --- a/crypto/x509/x509_vfy.c +++ b/crypto/x509/x509_vfy.c @@ -22,8 +22,8 @@ #include <openssl/x509.h> #include <openssl/x509v3.h> #include <openssl/objects.h> -#include <internal/dane.h> -#include <internal/x509_int.h> +#include "internal/dane.h" +#include "internal/x509_int.h" #include "x509_lcl.h" /* CRL score values */ @@ -14,7 +14,7 @@ # include <openssl/e_os2.h> # include <openssl/crypto.h> -# include <internal/nelem.h> +# include "internal/nelem.h" /* * <openssl/e_os2.h> contains what we can justify to make visible to the diff --git a/include/internal/dso.h b/include/internal/dso.h index c076c5887a..402a76f6df 100644 --- a/include/internal/dso.h +++ b/include/internal/dso.h @@ -11,7 +11,7 @@ # define HEADER_DSO_H # include <openssl/crypto.h> -# include <internal/dsoerr.h> +# include "internal/dsoerr.h" #ifdef __cplusplus extern "C" { diff --git a/test/asn1_internal_test.c b/test/asn1_internal_test.c index 06e324b5b7..34f7349114 100644 --- a/test/asn1_internal_test.c +++ b/test/asn1_internal_test.c @@ -16,7 +16,7 @@ #include <openssl/evp.h> #include <openssl/objects.h> #include "testutil.h" -#include <internal/nelem.h> +#include "internal/nelem.h" /********************************************************************** * diff --git a/test/asn1_time_test.c b/test/asn1_time_test.c index c185ece98f..96394a1bf8 100644 --- a/test/asn1_time_test.c +++ b/test/asn1_time_test.c @@ -16,7 +16,7 @@ #include <openssl/evp.h> #include <openssl/objects.h> #include "testutil.h" -#include <internal/nelem.h> +#include "internal/nelem.h" struct testdata { char *data; /* TIME string value */ diff --git a/test/bad_dtls_test.c b/test/bad_dtls_test.c index 932cb0eb1d..7f6ffdc3ca 100644 --- a/test/bad_dtls_test.c +++ b/test/bad_dtls_test.c @@ -37,10 +37,8 @@ #include <openssl/err.h> #include <openssl/rand.h> #include <openssl/kdf.h> - #include "../ssl/packet_locl.h" -#include <internal/nelem.h> - +#include "internal/nelem.h" #include "testutil.h" /* For DTLS1_BAD_VER packets the MAC doesn't include the handshake header */ diff --git a/test/bftest.c b/test/bftest.c index 0639ec888d..36029c2f7b 100644 --- a/test/bftest.c +++ b/test/bftest.c @@ -16,11 +16,9 @@ #include <string.h> #include <stdlib.h> #include <openssl/opensslconf.h> /* To see if OPENSSL_NO_BF is defined */ - #include "testutil.h" -#include <internal/nelem.h> - +#include "internal/nelem.h" #ifndef OPENSSL_NO_BF # include <openssl/blowfish.h> diff --git a/test/bntest.c b/test/bntest.c index da07446adb..667cba67a7 100644 --- a/test/bntest.c +++ b/test/bntest.c @@ -12,9 +12,9 @@ #include <string.h> #include <ctype.h> -#include <internal/nelem.h> +#include "internal/nelem.h" #include "../e_os.h" -#include <internal/numbers.h> +#include "internal/numbers.h" #include <openssl/bn.h> #include <openssl/crypto.h> #include <openssl/err.h> diff --git a/test/casttest.c b/test/casttest.c index 417a4cba2e..179d7d56d3 100644 --- a/test/casttest.c +++ b/test/casttest.c @@ -12,7 +12,7 @@ #include <stdlib.h> #include <openssl/opensslconf.h> /* To see if OPENSSL_NO_CAST is defined */ -#include <internal/nelem.h> +#include "internal/nelem.h" #include "testutil.h" #ifndef OPENSSL_NO_CAST diff --git a/test/cipher_overhead_test.c b/test/cipher_overhead_test.c index a07ac7e86b..f8c6fd738e 100644 --- a/test/cipher_overhead_test.c +++ b/test/cipher_overhead_test.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include <internal/nelem.h> +#include "internal/nelem.h" #include "testutil.h" #ifdef __VMS diff --git a/test/cipherbytes_test.c b/test/cipherbytes_test.c index 13d6b23aaa..6418b42408 100644 --- a/test/cipherbytes_test.c +++ b/test/cipherbytes_test.c @@ -18,7 +18,7 @@ #include <openssl/ssl3.h> #include <openssl/tls1.h> -#include <internal/nelem.h> +#include "internal/nelem.h" #include "testutil.h" static SSL_CTX *ctx; diff --git a/test/cipherlist_test.c b/test/cipherlist_test.c index 6ec963110e..2d8288d214 100644 --- a/test/cipherlist_test.c +++ b/test/cipherlist_test.c @@ -18,7 +18,7 @@ #include <openssl/ssl3.h> #include <openssl/tls1.h> |