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)

diff --git a/crypto/asn1/n_pkey.c b/crypto/asn1/n_pkey.c
index 91d6c60659baba86807da02531324effa0d2d1ed..d1d4874bcbe1ce2eddda5f84e58547abc9569bad 100644 (file)
--- 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 dce7d0c010d4e24c4122da17a12876082d0bbf90..367ddfd207dee80dc8cd1fc5fc6f344bce35a779 100644 (file)
--- 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 8da7a10fee19637732a2b82567d279ec090bdc1d..6ac4212db7de5c399149eb14f7b832285d31d1b6 100644 (file)
--- 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 93e0fa5e1740d23eaff5084bf8864d6be577105a..d82f0c7f2c9355d0895f23f960c157032e725dd3 100644 (file)
--- 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 01850e88974c61fdf140e9c3c1affdf15cb66ec3..83c24a546f53b3069926788d0e5d76ad6d2f6a7c 100644 (file)
--- 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 507b185f64e68c6150c7e75c63958d9a753323ed..8714a51422160d6e9a8fd4d2992c76075fe9901c 100644 (file)
--- 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 764d911dfb1d55d087e68c505e83448af5ec018c..7653545ee723020d2458753791ce419b0ede1bb5 100644 (file)
--- 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 32fe692d8ae86b3a1cc25df97d275a549738d140..574ad51581411fc55473636975f1c70362498119 100644 (file)
--- 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 ed3cebc6b1a0e9ff9ab39649995ab97a95c434d1..084bfa8243500bbeb28d1ae163d9dbd8d4555885 100644 (file)
--- 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 fa3b3eb8ab0355a8081819e7d9207d3de9b556f6..431aef908b5fff48fac2efa79536171afd9446d3 100644 (file)
--- 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 dae94226d772662d5dc791b7181e2c0f33ba879b..b572e681c50dd591b11a9c08c9d63061a2016b01 100644 (file)
--- 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 bd4debcd3931719642dbe76e7e0721f15b40508f..dc7516cedbf976ceaad0c635542988aa52d57617 100644 (file)
--- 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 45593be54429c71f4e3a94125b49198e044a8a94..506f35017392a572bb3f67cf3b62f1ee7e398828 100644 (file)
--- 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 c33ed3e2c2dd59b364c09a65114d52eff006aee4..f11bcc560c801dac179518104338dccd779e2736 100644 (file)
--- 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 f58cd4e4bc4d0b9e7dbe1ab7e97de750d0e60073..c08b14be4527774084607de126b834b83de89e57 100644 (file)
--- 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 e08bb31bf663ed33f762eb9ce54199f032be1296..bfa463acc5351d57667c7cfee9511069d822a758 100644 (file)
--- 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"