Use "" not <> for internal/ includes
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4217)
diff --git a/test/asn1_internal_test.c b/test/asn1_internal_test.c
index 06e324b..34f7349 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 c185ece..96394a1 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 932cb0e..7f6ffdc 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 0639ec8..36029c2 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 da07446..667cba6 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 417a4cb..179d7d5 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 a07ac7e..f8c6fd7 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 13d6b23..6418b42 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 6ec9631..2d8288d 100644
--- a/test/cipherlist_test.c
+++ b/test/cipherlist_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"
typedef struct cipherlist_test_fixture {
diff --git a/test/ciphername_test.c b/test/ciphername_test.c
index 0eac902..303e28f 100644
--- a/test/ciphername_test.c
+++ b/test/ciphername_test.c
@@ -19,7 +19,7 @@
#include <openssl/ssl3.h>
#include <openssl/tls1.h>
-#include <internal/nelem.h>
+#include "internal/nelem.h"
#include "testutil.h"
typedef struct cipher_id_name {
diff --git a/test/constant_time_test.c b/test/constant_time_test.c
index 24cbaf3..200cb37 100644
--- a/test/constant_time_test.c
+++ b/test/constant_time_test.c
@@ -10,7 +10,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include <internal/nelem.h>
+#include "internal/nelem.h"
#include "internal/constant_time_locl.h"
#include "testutil.h"
#include "internal/numbers.h"
diff --git a/test/crltest.c b/test/crltest.c
index f5af4b1..5ea9cdc 100644
--- a/test/crltest.c
+++ b/test/crltest.c
@@ -7,7 +7,7 @@
* https://www.openssl.org/source/license.html
*/
-#include <internal/nelem.h>
+#include "internal/nelem.h"
#include <string.h>
#include <openssl/bio.h>
#include <openssl/crypto.h>
diff --git a/test/d2i_test.c b/test/d2i_test.c
index 48edba4..255982e 100644
--- a/test/d2i_test.c
+++ b/test/d2i_test.c
@@ -20,7 +20,7 @@
#include <openssl/err.h>
#include <openssl/x509.h>
#include <openssl/x509v3.h>
-#include <internal/nelem.h>
+#include "internal/nelem.h"
static const ASN1_ITEM *item_type;
static const char *test_file;
diff --git a/test/danetest.c b/test/danetest.c
index de51c83..54a79ab 100644
--- a/test/danetest.c
+++ b/test/danetest.c
@@ -24,7 +24,7 @@
#endif
#include "testutil.h"
-#include <internal/nelem.h>
+#include "internal/nelem.h"
#define _UC(c) ((unsigned char)(c))
@@ -422,7 +422,7 @@
return 1;
}
-#include <internal/dane.h>
+#include "internal/dane.h"
static void store_ctx_dane_init(X509_STORE_CTX *store_ctx, SSL *ssl)
{
diff --git a/test/dhtest.c b/test/dhtest.c
index ac09c44..7500f37 100644
--- a/test/dhtest.c
+++ b/test/dhtest.c
@@ -11,7 +11,7 @@
#include <stdlib.h>
#include <string.h>
-#include <internal/nelem.h>
+#include "internal/nelem.h"
#include <openssl/crypto.h>
#include <openssl/bio.h>
#include <openssl/bn.h>
diff --git a/test/drbgtest.c b/test/drbgtest.c
index 28d0d90..2363b50 100644
--- a/test/drbgtest.c
+++ b/test/drbgtest.c
@@ -8,7 +8,7 @@
*/
#include <string.h>
-#include <internal/nelem.h>
+#include "internal/nelem.h"
#include <openssl/crypto.h>
#include <openssl/err.h>
#include <openssl/rand.h>
diff --git a/test/dsatest.c b/test/dsatest.c
index d25a1d7..fa2ec4a 100644
--- a/test/dsatest.c
+++ b/test/dsatest.c
@@ -19,7 +19,7 @@
#include <openssl/dsa.h>
#include "testutil.h"
-#include <internal/nelem.h>
+#include "internal/nelem.h"
#ifndef OPENSSL_NO_DSA
static int dsa_cb(int p, int n, BN_GENCB *arg);
diff --git a/test/dtlsv1listentest.c b/test/dtlsv1listentest.c
index 00120cc..807bb6d 100644
--- a/test/dtlsv1listentest.c
+++ b/test/dtlsv1listentest.c
@@ -12,7 +12,7 @@
#include <openssl/bio.h>
#include <openssl/err.h>
#include <openssl/conf.h>
-#include <internal/nelem.h>
+#include "internal/nelem.h"
#include "testutil.h"
#ifndef OPENSSL_NO_SOCK
diff --git a/test/ecstresstest.c b/test/ecstresstest.c
index b47095c..3c6d2d5 100644
--- a/test/ecstresstest.c
+++ b/test/ecstresstest.c
@@ -8,7 +8,7 @@
* or in the file LICENSE in the source distribution.
*/
-#include <internal/nelem.h>
+#include "internal/nelem.h"
#include "testutil.h"
#include <stdio.h>
diff --git a/test/ectest.c b/test/ectest.c
index 85847e0..3267a3d 100644
--- a/test/ectest.c
+++ b/test/ectest.c
@@ -8,7 +8,7 @@
* https://www.openssl.org/source/license.html
*/
-#include <internal/nelem.h>
+#include "internal/nelem.h"
#include "testutil.h"
#ifndef OPENSSL_NO_EC
diff --git a/test/evp_extra_test.c b/test/evp_extra_test.c
index 5ca95e4..e3fab29 100644
--- a/test/evp_extra_test.c
+++ b/test/evp_extra_test.c
@@ -16,7 +16,7 @@
#include <openssl/rsa.h>
#include <openssl/x509.h>
#include "testutil.h"
-#include <internal/nelem.h>
+#include "internal/nelem.h"
/*
* kExampleRSAKeyDER is an RSA private key in ASN.1, DER format. Of course, you
diff --git a/test/exptest.c b/test/exptest.c
index 62a2377..cde4d6b 100644
--- a/test/exptest.c
+++ b/test/exptest.c
@@ -11,7 +11,7 @@
#include <stdlib.h>
#include <string.h>
-#include <internal/nelem.h>
+#include "internal/nelem.h"
#include <openssl/bio.h>
#include <openssl/bn.h>
diff --git a/test/handshake_helper.c b/test/handshake_helper.c
index b33cdd5..322957a 100644
--- a/test/handshake_helper.c
+++ b/test/handshake_helper.c
@@ -18,7 +18,7 @@
#ifndef OPENSSL_NO_SOCK
# define USE_SOCKETS
-# include <internal/nelem.h>
+# include "internal/nelem.h"
#endif
#include "handshake_helper.h"
diff --git a/test/hmactest.c b/test/hmactest.c
index abd1193..ca77577 100644
--- a/test/hmactest.c
+++ b/test/hmactest.c
@@ -11,7 +11,7 @@
#include <string.h>
#include <stdlib.h>
-#include <internal/nelem.h>
+#include "internal/nelem.h"
# include <openssl/hmac.h>
# include <openssl/sha.h>
diff --git a/test/ideatest.c b/test/ideatest.c
index 5b715fe..c80e18f 100644
--- a/test/ideatest.c
+++ b/test/ideatest.c
@@ -9,7 +9,7 @@
#include <string.h>
-#include <internal/nelem.h>
+#include "internal/nelem.h"
#include "testutil.h"
#ifndef OPENSSL_NO_IDEA
diff --git a/test/igetest.c b/test/igetest.c
index 8a1db67..46910f8 100644
--- a/test/igetest.c
+++ b/test/igetest.c
@@ -12,7 +12,7 @@
#include <openssl/rand.h>
#include <stdio.h>
#include <string.h>
-#include <internal/nelem.h>
+#include "internal/nelem.h"
#include "testutil.h"
#define TEST_SIZE 128
diff --git a/test/lhash_test.c b/test/lhash_test.c
index 6deea8d..162286b 100644
--- a/test/lhash_test.c
+++ b/test/lhash_test.c
@@ -16,7 +16,7 @@
#include <openssl/err.h>
#include <openssl/crypto.h>
-#include <internal/nelem.h>
+#include "internal/nelem.h"
#include "testutil.h"
/*
diff --git a/test/md2test.c b/test/md2test.c
index df55932..c5360d6 100644
--- a/test/md2test.c
+++ b/test/md2test.c
@@ -9,7 +9,7 @@
#include <string.h>
-#include <internal/nelem.h>
+#include "internal/nelem.h"
#include "testutil.h"
#ifndef OPENSSL_NO_MD2
diff --git a/test/mdc2_internal_test.c b/test/mdc2_internal_test.c
index c5e74ea..64aa2dc 100644
--- a/test/mdc2_internal_test.c
+++ b/test/mdc2_internal_test.c
@@ -14,7 +14,7 @@
#include <openssl/mdc2.h>
#include "testutil.h"
-#include <internal/nelem.h>
+#include "internal/nelem.h"
typedef struct {
const char *input;
diff --git a/test/mdc2test.c b/test/mdc2test.c
index 5dfe60e..0658843 100644
--- a/test/mdc2test.c
+++ b/test/mdc2test.c
@@ -9,7 +9,7 @@
#include <string.h>
-#include <internal/nelem.h>
+#include "internal/nelem.h"
#include "testutil.h"
#if defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_MDC2)
diff --git a/test/modes_internal_test.c b/test/modes_internal_test.c
index 3fd0498..f3e46fe 100644
--- a/test/modes_internal_test.c
+++ b/test/modes_internal_test.c
@@ -16,7 +16,7 @@
#include <openssl/modes.h>
#include "../crypto/modes/modes_lcl.h"
#include "testutil.h"
-#include <internal/nelem.h>
+#include "internal/nelem.h"
typedef struct {
size_t size;
diff --git a/test/poly1305_internal_test.c b/test/poly1305_internal_test.c
index 55b7644..d1d71c9 100644
--- a/test/poly1305_internal_test.c
+++ b/test/poly1305_internal_test.c
@@ -15,7 +15,7 @@
#include "testutil.h"
#include "internal/poly1305.h"
#include "../crypto/poly1305/poly1305_local.h"
-#include <internal/nelem.h>
+#include "internal/nelem.h"
typedef struct {
size_t size;
diff --git a/test/rc2test.c b/test/rc2test.c
index fc00076..e64d1a7 100644
--- a/test/rc2test.c
+++ b/test/rc2test.c
@@ -7,7 +7,7 @@
* https://www.openssl.org/source/license.html
*/
-#include <internal/nelem.h>
+#include "internal/nelem.h"
#include "testutil.h"
#ifndef OPENSSL_NO_RC2
diff --git a/test/rc4test.c b/test/rc4test.c
index e3f41b6..15706ea 100644
--- a/test/rc4test.c
+++ b/test/rc4test.c
@@ -9,7 +9,7 @@
#include <string.h>
-#include <internal/nelem.h>
+#include "internal/nelem.h"
#include "testutil.h"
#ifndef OPENSSL_NO_RC4
diff --git a/test/rc5test.c b/test/rc5test.c
index 9aa214f..d49366d 100644
--- a/test/rc5test.c
+++ b/test/rc5test.c
@@ -9,7 +9,7 @@
#include <string.h>
-#include <internal/nelem.h>
+#include "internal/nelem.h"
#include "testutil.h"
#ifndef OPENSSL_NO_RC5
diff --git a/test/rsa_test.c b/test/rsa_test.c
index 13dcde1..2ad4de4 100644
--- a/test/rsa_test.c
+++ b/test/rsa_test.c
@@ -12,7 +12,7 @@
#include <stdio.h>
#include <string.h>
-#include <internal/nelem.h>
+#include "internal/nelem.h"
#include <openssl/crypto.h>
#include <openssl/err.h>
diff --git a/test/sanitytest.c b/test/sanitytest.c
index 80a19e9..743c03b 100644
--- a/test/sanitytest.c
+++ b/test/sanitytest.c
@@ -8,7 +8,7 @@
*/
#include <string.h>
-#include <internal/numbers.h>
+#include "internal/numbers.h"
#include "testutil.h"
diff --git a/test/servername_test.c b/test/servername_test.c
index f1b66ee..e0c473e 100644
--- a/test/servername_test.c
+++ b/test/servername_test.c
@@ -21,7 +21,7 @@
#include "../ssl/packet_locl.h"
#include "testutil.h"
-#include <internal/nelem.h>
+#include "internal/nelem.h"
#define CLIENT_VERSION_LEN 2
diff --git a/test/siphash_internal_test.c b/test/siphash_internal_test.c
index 60a2d8d..5401e8c 100644
--- a/test/siphash_internal_test.c
+++ b/test/siphash_internal_test.c
@@ -16,7 +16,7 @@
#include "testutil.h"
#include "internal/siphash.h"
#include "../crypto/siphash/siphash_local.h"
-#include <internal/nelem.h>
+#include "internal/nelem.h"
static BIO* b_stderr = NULL;
static BIO* b_stdout = NULL;
diff --git a/test/ssl_cert_table_internal_test.c b/test/ssl_cert_table_internal_test.c
index 9f52015..b298cfe 100644
--- a/test/ssl_cert_table_internal_test.c
+++ b/test/ssl_cert_table_internal_test.c
@@ -14,7 +14,7 @@
#include <openssl/ssl.h>
#include "testutil.h"
-#include <internal/nelem.h>
+#include "internal/nelem.h"
#ifdef __VMS
# pragma names save
diff --git a/test/ssl_test_ctx.c b/test/ssl_test_ctx.c
index c9b0c43..d4642e7 100644
--- a/test/ssl_test_ctx.c
+++ b/test/ssl_test_ctx.c
@@ -12,7 +12,7 @@
#include <openssl/e_os2.h>
#include <openssl/crypto.h>
-#include <internal/nelem.h>
+#include "internal/nelem.h"
#include "../e_os.h"
#include "ssl_test_ctx.h"
#include "testutil.h"
diff --git a/test/ssl_test_ctx_test.c b/test/ssl_test_ctx_test.c
index 2376ce1..194919d 100644
--- a/test/ssl_test_ctx_test.c
+++ b/test/ssl_test_ctx_test.c
@@ -15,7 +15,7 @@
#include <stdio.h>
#include <string.h>
-#include <internal/nelem.h>
+#include "internal/nelem.h"
#include "ssl_test_ctx.h"
#include "testutil.h"
#include <openssl/e_os2.h>
diff --git a/test/sslapitest.c b/test/sslapitest.c
index 571da55..622f159 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -17,7 +17,7 @@
#include "ssltestlib.h"
#include "testutil.h"
-#include <internal/nelem.h>
+#include "internal/nelem.h"
#include "../ssl/ssl_locl.h"
static char *cert = NULL;
diff --git a/test/ssltest_old.c b/test/ssltest_old.c
index 9e3bb7a..b95a5a4 100644
--- a/test/ssltest_old.c
+++ b/test/ssltest_old.c
@@ -25,7 +25,7 @@
#include <string.h>
#include <time.h>
-#include <internal/nelem.h>
+#include "internal/nelem.h"
#define USE_SOCKETS
#include "e_os.h"
diff --git a/test/ssltestlib.c b/test/ssltestlib.c
index 410d323..4473c67 100644
--- a/test/ssltestlib.c
+++ b/test/ssltestlib.c
@@ -9,7 +9,7 @@
#include <string.h>
-#include <internal/nelem.h>
+#include "internal/nelem.h"
#include "ssltestlib.h"
#include "testutil.h"
diff --git a/test/stack_test.c b/test/stack_test.c
index 922dfdd..c0ec46a 100644
--- a/test/stack_test.c
+++ b/test/stack_test.c
@@ -16,7 +16,7 @@
#include <openssl/err.h>
#include <openssl/crypto.h>
-#include <internal/nelem.h>
+#include "internal/nelem.h"
#include "testutil.h"
/* The macros below generate unused functions which error out one of the clang
diff --git a/test/test_test.c b/test/test_test.c
index 742cd61..2ec2b51 100644
--- a/test/test_test.c
+++ b/test/test_test.c
@@ -16,7 +16,7 @@
#include <openssl/crypto.h>
#include <openssl/bn.h>
-#include <internal/nelem.h>
+#include "internal/nelem.h"
#include "testutil.h"
#define TEST(expected, test) test_case((expected), #test, (test))
diff --git a/test/testutil/driver.c b/test/testutil/driver.c
index 1859706..2c28a73 100644
--- a/test/testutil/driver.c
+++ b/test/testutil/driver.c
@@ -14,7 +14,7 @@
#include <string.h>
#include <assert.h>
-#include <internal/nelem.h>
+#include "internal/nelem.h"
#include <openssl/bio.h>
/*
diff --git a/test/testutil/format_output.c b/test/testutil/format_output.c
index 9b04a94..9b9bab1 100644
--- a/test/testutil/format_output.c
+++ b/test/testutil/format_output.c
@@ -13,7 +13,7 @@
#include <string.h>
#include <ctype.h>
-#include <internal/nelem.h>
+#include "internal/nelem.h"
/* The size of memory buffers to display on failure */
#define MEM_BUFFER_SIZE (2000)
diff --git a/test/testutil/main.c b/test/testutil/main.c
index 2f4eeb6..6781a52 100644
--- a/test/testutil/main.c
+++ b/test/testutil/main.c
@@ -8,7 +8,7 @@
*/
#include "../testutil.h"
-#include <internal/nelem.h>
+#include "internal/nelem.h"
#include "output.h"
#include "tu_local.h"
diff --git a/test/testutil/tests.c b/test/testutil/tests.c
index cea81ca..eb0a393 100644
--- a/test/testutil/tests.c
+++ b/test/testutil/tests.c
@@ -14,7 +14,7 @@
#include <errno.h>
#include <string.h>
#include <ctype.h>
-#include <internal/nelem.h>
+#include "internal/nelem.h"
/*
* Output a failed test first line.
diff --git a/test/time_offset_test.c b/test/time_offset_test.c
index 8814ccb..f3b20dd 100644
--- a/test/time_offset_test.c
+++ b/test/time_offset_test.c
@@ -16,7 +16,7 @@
#include <openssl/asn1.h>
#include <openssl/x509.h>
#include "testutil.h"
-#include <internal/nelem.h>
+#include "internal/nelem.h"
typedef struct {
const char *data;
diff --git a/test/v3nametest.c b/test/v3nametest.c
index dee4832..a4ba775 100644
--- a/test/v3nametest.c
+++ b/test/v3nametest.c
@@ -8,7 +8,7 @@
*/
#include <string.h>
-#include <internal/nelem.h>
+#include "internal/nelem.h"
#include "../e_os.h"
#include <openssl/x509.h>
#include <openssl/x509v3.h>
diff --git a/test/x509_internal_test.c b/test/x509_internal_test.c
index 930c01c..2385d53 100644
--- a/test/x509_internal_test.c
+++ b/test/x509_internal_test.c
@@ -15,7 +15,7 @@
#include <openssl/x509.h>
#include <openssl/x509v3.h>
#include "testutil.h"
-#include <internal/nelem.h>
+#include "internal/nelem.h"
/**********************************************************************
*
diff --git a/test/x509_time_test.c b/test/x509_time_test.c
index e8cec0c..5983bdf 100644
--- a/test/x509_time_test.c
+++ b/test/x509_time_test.c
@@ -15,7 +15,7 @@
#include <openssl/asn1.h>
#include <openssl/x509.h>
#include "testutil.h"
-#include <internal/nelem.h>
+#include "internal/nelem.h"
typedef struct {
const char *data;
diff --git a/test/x509aux.c b/test/x509aux.c
index d38aeb0..b66e1de 100644
--- a/test/x509aux.c
+++ b/test/x509aux.c
@@ -16,7 +16,7 @@
#include <openssl/pem.h>
#include <openssl/conf.h>
#include <openssl/err.h>
-#include <internal/nelem.h>
+#include "internal/nelem.h"
#include "testutil.h"
static int test_certs(int num)
