diff options
author | Rich Salz <rsalz@akamai.com> | 2021-05-25 15:06:22 -0400 |
---|---|---|
committer | Pauli <pauli@openssl.org> | 2021-05-27 09:56:41 +1000 |
commit | 6229815ab8f6e0a6e272c7a7094a061606cd0a90 (patch) | |
tree | 08d8dbb2c845fbe892f139ec100cc4bc730bce6d | |
parent | e475d9a443ecb20d7cec711e208190c1e2b5bb0d (diff) |
Use <> for #include openssl/xxx
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15468)
-rw-r--r-- | crypto/asn1/n_pkey.c | 3 | ||||
-rw-r--r-- | crypto/cmp/cmp_client.c | 3 | ||||
-rw-r--r-- | crypto/cmp/cmp_http.c | 2 | ||||
-rw-r--r-- | crypto/conf/conf_mod.c | 2 | ||||
-rw-r--r-- | crypto/ctype.c | 2 | ||||
-rw-r--r-- | crypto/ec/curve448/arch_32/f_impl32.c | 2 | ||||
-rw-r--r-- | crypto/ec/curve448/arch_64/f_impl64.c | 2 | ||||
-rw-r--r-- | crypto/ec/ec_ameth.c | 2 | ||||
-rw-r--r-- | crypto/seed/seed_local.h | 2 | ||||
-rw-r--r-- | include/crypto/aes_platform.h | 2 | ||||
-rw-r--r-- | include/internal/ktls.h | 8 | ||||
-rw-r--r-- | providers/implementations/ciphers/cipher_camellia.h | 2 | ||||
-rw-r--r-- | providers/implementations/keymgmt/ecx_kmgmt.c | 2 | ||||
-rw-r--r-- | providers/implementations/keymgmt/mac_legacy_kmgmt.c | 2 | ||||
-rw-r--r-- | test/ectest.c | 6 | ||||
-rw-r--r-- | test/param_build_test.c | 2 |
16 files changed, 21 insertions, 23 deletions
diff --git a/crypto/asn1/n_pkey.c b/crypto/asn1/n_pkey.c index 91d6c60659..d1d4874bcb 100644 --- a/crypto/asn1/n_pkey.c +++ b/crypto/asn1/n_pkey.c @@ -7,8 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "openssl/opensslconf.h" - +#include <openssl/opensslconf.h> #include "internal/cryptlib.h" #include <stdio.h> #include <openssl/rsa.h> diff --git a/crypto/cmp/cmp_client.c b/crypto/cmp/cmp_client.c index dce7d0c010..367ddfd207 100644 --- a/crypto/cmp/cmp_client.c +++ b/crypto/cmp/cmp_client.c @@ -19,8 +19,7 @@ #include <openssl/err.h> #include <openssl/evp.h> #include <openssl/x509v3.h> - -#include "openssl/cmp_util.h" +#include <openssl/cmp_util.h> #define IS_CREP(t) ((t) == OSSL_CMP_PKIBODY_IP || (t) == OSSL_CMP_PKIBODY_CP \ || (t) == OSSL_CMP_PKIBODY_KUP) diff --git a/crypto/cmp/cmp_http.c b/crypto/cmp/cmp_http.c index 8da7a10fee..6ac4212db7 100644 --- a/crypto/cmp/cmp_http.c +++ b/crypto/cmp/cmp_http.c @@ -16,7 +16,7 @@ #include <openssl/http.h> #include "internal/sockets.h" -#include "openssl/cmp.h" +#include <openssl/cmp.h> #include "cmp_local.h" /* explicit #includes not strictly needed since implied by the above: */ diff --git a/crypto/conf/conf_mod.c b/crypto/conf/conf_mod.c index 93e0fa5e17..d82f0c7f2c 100644 --- a/crypto/conf/conf_mod.c +++ b/crypto/conf/conf_mod.c @@ -15,7 +15,7 @@ #include <ctype.h> #include <openssl/crypto.h> #include "internal/conf.h" -#include "openssl/conf_api.h" +#include <openssl/conf_api.h> #include "internal/dso.h" #include "internal/thread_once.h" #include <openssl/x509.h> diff --git a/crypto/ctype.c b/crypto/ctype.c index 01850e8897..83c24a546f 100644 --- a/crypto/ctype.c +++ b/crypto/ctype.c @@ -10,7 +10,7 @@ #include <string.h> #include <stdio.h> #include "crypto/ctype.h" -#include "openssl/ebcdic.h" +#include <openssl/ebcdic.h> /* * Define the character classes for each character in the seven bit ASCII diff --git a/crypto/ec/curve448/arch_32/f_impl32.c b/crypto/ec/curve448/arch_32/f_impl32.c index 507b185f64..8714a51422 100644 --- a/crypto/ec/curve448/arch_32/f_impl32.c +++ b/crypto/ec/curve448/arch_32/f_impl32.c @@ -11,7 +11,7 @@ */ #include "e_os.h" -#include "openssl/macros.h" +#include <openssl/macros.h> #include "internal/numbers.h" #ifdef UINT128_MAX diff --git a/crypto/ec/curve448/arch_64/f_impl64.c b/crypto/ec/curve448/arch_64/f_impl64.c index 764d911dfb..7653545ee7 100644 --- a/crypto/ec/curve448/arch_64/f_impl64.c +++ b/crypto/ec/curve448/arch_64/f_impl64.c @@ -11,7 +11,7 @@ */ #include "e_os.h" -#include "openssl/macros.h" +#include <openssl/macros.h> #include "internal/numbers.h" #ifndef UINT128_MAX diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c index 32fe692d8a..574ad51581 100644 --- a/crypto/ec/ec_ameth.c +++ b/crypto/ec/ec_ameth.c @@ -23,7 +23,7 @@ #include "crypto/evp.h" #include "crypto/x509.h" #include <openssl/core_names.h> -#include "openssl/param_build.h" +#include <openssl/param_build.h> #include "ec_local.h" static int eckey_param2type(int *pptype, void **ppval, const EC_KEY *ec_key) diff --git a/crypto/seed/seed_local.h b/crypto/seed/seed_local.h index ed3cebc6b1..084bfa8243 100644 --- a/crypto/seed/seed_local.h +++ b/crypto/seed/seed_local.h @@ -35,7 +35,7 @@ #ifndef OSSL_CRYPTO_SEED_LOCAL_H # define OSSL_CRYPTO_SEED_LOCAL_H -# include "openssl/e_os2.h" +# include <openssl/e_os2.h> # include <openssl/seed.h> # ifdef SEED_LONG /* need 32-bit type */ diff --git a/include/crypto/aes_platform.h b/include/crypto/aes_platform.h index fa3b3eb8ab..431aef908b 100644 --- a/include/crypto/aes_platform.h +++ b/include/crypto/aes_platform.h @@ -11,7 +11,7 @@ # define OSSL_AES_PLATFORM_H # pragma once -# include "openssl/aes.h" +# include <openssl/aes.h> # ifdef VPAES_ASM int vpaes_set_encrypt_key(const unsigned char *userKey, int bits, diff --git a/include/internal/ktls.h b/include/internal/ktls.h index dae94226d7..b572e681c5 100644 --- a/include/internal/ktls.h +++ b/include/internal/ktls.h @@ -32,7 +32,7 @@ # include <sys/ktls.h> # include <netinet/in.h> # include <netinet/tcp.h> -# include "openssl/ssl3.h" +# include <openssl/ssl3.h> # ifndef TCP_RXTLS_ENABLE # define OPENSSL_NO_KTLS_RX @@ -232,9 +232,9 @@ static ossl_inline ossl_ssize_t ktls_sendfile(int s, int fd, off_t off, # include <sys/sendfile.h> # include <netinet/tcp.h> # include <linux/socket.h> -# include "openssl/ssl3.h" -# include "openssl/tls1.h" -# include "openssl/evp.h" +# include <openssl/ssl3.h> +# include <openssl/tls1.h> +# include <openssl/evp.h> # ifndef SOL_TLS # define SOL_TLS 282 diff --git a/providers/implementations/ciphers/cipher_camellia.h b/providers/implementations/ciphers/cipher_camellia.h index bd4debcd39..dc7516cedb 100644 --- a/providers/implementations/ciphers/cipher_camellia.h +++ b/providers/implementations/ciphers/cipher_camellia.h @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "openssl/camellia.h" +#include <openssl/camellia.h> #include "prov/ciphercommon.h" #include "crypto/cmll_platform.h" diff --git a/providers/implementations/keymgmt/ecx_kmgmt.c b/providers/implementations/keymgmt/ecx_kmgmt.c index 45593be544..506f350173 100644 --- a/providers/implementations/keymgmt/ecx_kmgmt.c +++ b/providers/implementations/keymgmt/ecx_kmgmt.c @@ -19,7 +19,7 @@ #include <openssl/evp.h> #include <openssl/rand.h> #include "internal/param_build_set.h" -#include "openssl/param_build.h" +#include <openssl/param_build.h> #include "crypto/ecx.h" #include "prov/implementations.h" #include "prov/providercommon.h" diff --git a/providers/implementations/keymgmt/mac_legacy_kmgmt.c b/providers/implementations/keymgmt/mac_legacy_kmgmt.c index c33ed3e2c2..f11bcc560c 100644 --- a/providers/implementations/keymgmt/mac_legacy_kmgmt.c +++ b/providers/implementations/keymgmt/mac_legacy_kmgmt.c @@ -17,7 +17,7 @@ #include <openssl/err.h> #include <openssl/evp.h> #include <openssl/proverr.h> -#include "openssl/param_build.h" +#include <openssl/param_build.h> #include "internal/param_build_set.h" #include "prov/implementations.h" #include "prov/providercommon.h" diff --git a/test/ectest.c b/test/ectest.c index f58cd4e4bc..c08b14be45 100644 --- a/test/ectest.c +++ b/test/ectest.c @@ -28,9 +28,9 @@ #include <openssl/rand.h> #include <openssl/bn.h> #include <openssl/opensslconf.h> -#include "openssl/core_names.h" -#include "openssl/param_build.h" -#include "openssl/evp.h" +#include <openssl/core_names.h> +#include <openssl/param_build.h> +#include <openssl/evp.h> static size_t crv_len = 0; static EC_builtin_curve *curves = NULL; diff --git a/test/param_build_test.c b/test/param_build_test.c index e08bb31bf6..bfa463acc5 100644 --- a/test/param_build_test.c +++ b/test/param_build_test.c @@ -10,7 +10,7 @@ #include <string.h> #include <openssl/params.h> -#include "openssl/param_build.h" +#include <openssl/param_build.h> #include "internal/nelem.h" #include "testutil.h" |