From 449bdf3746244160e8ab0ee3ac73d4c73017c2fb Mon Sep 17 00:00:00 2001
From: Rich Salz <rsalz@akamai.com>
Date: Tue, 25 May 2021 15:08:03 -0400
Subject: [PATCH] Use "" for include internal/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)
---
 apps/s_time.c               | 2 +-
 crypto/dh/dh_kdf.c          | 2 +-
 crypto/evp/e_rc4_hmac_md5.c | 2 +-
 crypto/ppccap.c             | 2 +-
 fuzz/asn1.c                 | 2 +-
 providers/fips/self_test.c  | 4 ++--
 ssl/statem/statem_clnt.c    | 2 +-
 test/sparse_array_test.c    | 3 +--
 test/tls-provider.c         | 2 +-
 9 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/apps/s_time.c b/apps/s_time.c
index 8c43db952e..34e939d047 100644
--- a/apps/s_time.c
+++ b/apps/s_time.c
@@ -22,7 +22,7 @@
 #include <openssl/pem.h>
 #include "s_apps.h"
 #include <openssl/err.h>
-#include <internal/sockets.h>
+#include "internal/sockets.h"
 #if !defined(OPENSSL_SYS_MSDOS)
 # include <unistd.h>
 #endif
diff --git a/crypto/dh/dh_kdf.c b/crypto/dh/dh_kdf.c
index 619571537a..0ec7644909 100644
--- a/crypto/dh/dh_kdf.c
+++ b/crypto/dh/dh_kdf.c
@@ -21,7 +21,7 @@
 #include <openssl/evp.h>
 #include <openssl/asn1.h>
 #include <openssl/kdf.h>
-#include <internal/provider.h>
+#include "internal/provider.h"
 #include <crypto/dh.h>
 
 /* Key derivation function from X9.63/SECG */
diff --git a/crypto/evp/e_rc4_hmac_md5.c b/crypto/evp/e_rc4_hmac_md5.c
index 6a38f95d5e..c8b6da246f 100644
--- a/crypto/evp/e_rc4_hmac_md5.c
+++ b/crypto/evp/e_rc4_hmac_md5.c
@@ -13,7 +13,7 @@
  */
 #include "internal/deprecated.h"
 
-#include <internal/cryptlib.h>
+#include "internal/cryptlib.h"
 #include <openssl/opensslconf.h>
 
 #include <stdio.h>
diff --git a/crypto/ppccap.c b/crypto/ppccap.c
index a504bc59b0..2048be7b1d 100644
--- a/crypto/ppccap.c
+++ b/crypto/ppccap.c
@@ -28,7 +28,7 @@
 #endif
 #include <openssl/crypto.h>
 #include <openssl/bn.h>
-#include <internal/cryptlib.h>
+#include "internal/cryptlib.h"
 #include <crypto/chacha.h>
 #include "bn/bn_local.h"
 
diff --git a/fuzz/asn1.c b/fuzz/asn1.c
index 449d851e68..8ce9a57c25 100644
--- a/fuzz/asn1.c
+++ b/fuzz/asn1.c
@@ -37,7 +37,7 @@
 #include <openssl/bio.h>
 #include <openssl/evp.h>
 #include <openssl/ssl.h>
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 #include "fuzzer.h"
 
 static ASN1_ITEM_EXP *item_type[] = {
diff --git a/providers/fips/self_test.c b/providers/fips/self_test.c
index 2b3b30de27..a4d7a4ffe2 100644
--- a/providers/fips/self_test.c
+++ b/providers/fips/self_test.c
@@ -11,7 +11,7 @@
 #include <openssl/evp.h>
 #include <openssl/params.h>
 #include <openssl/crypto.h>
-#include <internal/cryptlib.h>
+#include "internal/cryptlib.h"
 #include <openssl/fipskey.h>
 #include <openssl/err.h>
 #include <openssl/proverr.h>
@@ -25,7 +25,7 @@
  * it should be run once regardless of the number of OSSL_LIB_CTXs we have.
  */
 #define ALLOW_RUN_ONCE_IN_FIPS
-#include <internal/thread_once.h>
+#include "internal/thread_once.h"
 #include "self_test.h"
 
 #define FIPS_STATE_INIT     0
diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index 85ed3e4259..ad1d0e7e05 100644
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c
@@ -26,7 +26,7 @@
 #include <openssl/trace.h>
 #include <openssl/core_names.h>
 #include <openssl/param_build.h>
-#include <internal/cryptlib.h>
+#include "internal/cryptlib.h"
 
 static MSG_PROCESS_RETURN tls_process_as_hello_retry_request(SSL *s, PACKET *pkt);
 static MSG_PROCESS_RETURN tls_process_encrypted_extensions(SSL *s, PACKET *pkt);
diff --git a/test/sparse_array_test.c b/test/sparse_array_test.c
index 2c7f5a878c..69f830e5c7 100644
--- a/test/sparse_array_test.c
+++ b/test/sparse_array_test.c
@@ -13,8 +13,7 @@
 #include <limits.h>
 
 #include <openssl/crypto.h>
-#include <internal/nelem.h>
-
+#include "internal/nelem.h"
 #include "crypto/sparse_array.h"
 #include "testutil.h"
 
diff --git a/test/tls-provider.c b/test/tls-provider.c
index d9d52664b2..20360d469e 100644
--- a/test/tls-provider.c
+++ b/test/tls-provider.c
@@ -14,7 +14,7 @@
 #include <openssl/params.h>
 /* For TLS1_3_VERSION */
 #include <openssl/ssl.h>
-#include <internal/nelem.h>
+#include "internal/nelem.h"
 
 static OSSL_FUNC_keymgmt_import_fn xor_import;
 static OSSL_FUNC_keymgmt_import_types_fn xor_import_types;