Remove tests dependence on e_os.h

Apart from ssltest_old.c, the test suite relied on e_os.h for the
OSSL_NELEM macro and nothing else.

The ssltest_old.c also requires EXIT and some socket macros.

Create a new header to define the OSSL_NELEM macro and use that instead.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4186)

diff --git a/e_os.h b/e_os.h
index 4e01f9b815d526ca9bf5ebda93f65de5daf9a8c4..87d98c24be2a5958fe0a1ad0dcb8819222605db6 100644 (file)
--- a/e_os.h
+++ b/e_os.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -14,6 +14,8 @@
 
 # include <openssl/e_os2.h>
 # include <openssl/crypto.h>
+# include <internal/nelem.h>
+
 /*
  * <openssl/e_os2.h> contains what we can justify to make visible to the
  * outside; this file e_os.h is not part of the exported interface.
@@ -540,8 +542,6 @@ struct servent *getservbyname(const char *name, const char *proto);
 # endif
 /* end vxworks */
 
-#define OSSL_NELEM(x)    (sizeof(x)/sizeof((x)[0]))
-
 #ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
 # define CRYPTO_memcmp memcmp
 #endif

diff --git a/include/internal/nelem.h b/include/internal/nelem.h
new file mode 100644 (file)
index 0000000..d65a21a
--- /dev/null
+++ b/include/internal/nelem.h
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the OpenSSL license (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef HEADER_NELEM_H
+# define HEADER_NELEM_H
+
+# define OSSL_NELEM(x)    (sizeof(x)/sizeof((x)[0]))
+#endif

diff --git a/test/asn1_internal_test.c b/test/asn1_internal_test.c
index 194a07378867dd9f73c0a14228b6c87f4cc3946c..06e324b5b7b6e24098912d093a47335598d01e64 100644 (file)
--- 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 "e_os.h"
+#include <internal/nelem.h>
 
 /**********************************************************************
  *

diff --git a/test/asn1_time_test.c b/test/asn1_time_test.c
index 184a18a5ad1fc47328848dd3f731fe8877ead195..897436c3f4c685f3f4a730fa1c725febe66fcbcf 100644 (file)
--- 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 "e_os.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 2c10a1cc5b26b0d4a412c25a11aaeacaf660ea29..932cb0eb1daf48cd44e7491b53aaf8bb2350e00c 100644 (file)
--- a/test/bad_dtls_test.c
+++ b/test/bad_dtls_test.c
@@ -39,7 +39,7 @@
 #include <openssl/kdf.h>
 
 #include "../ssl/packet_locl.h"
-#include "../e_os.h" /* for OSSL_NELEM() */
+#include <internal/nelem.h>
 
 #include "testutil.h"
 

diff --git a/test/bftest.c b/test/bftest.c
index cc509f2dfcc97f73cb2a076ec0cbb9ef99f12cc1..0639ec888d35854a3cdd5095c2db6dba64ef446c 100644 (file)
--- a/test/bftest.c
+++ b/test/bftest.c
@@ -19,7 +19,7 @@
 
 #include "testutil.h"
 
-#include "../e_os.h"
+#include <internal/nelem.h>
 
 #ifndef OPENSSL_NO_BF
 # include <openssl/blowfish.h>

diff --git a/test/bntest.c b/test/bntest.c
index f32b308d0c8e121b82526c27917bffefa09623b1..cb292c6abadf56dac695a66560ac5bf4fb52d603 100644 (file)
--- a/test/bntest.c
+++ b/test/bntest.c
@@ -12,7 +12,7 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "e_os.h"
+#include <internal/nelem.h>
 #include <internal/numbers.h>
 #include <openssl/bn.h>
 #include <openssl/crypto.h>

diff --git a/test/casttest.c b/test/casttest.c
index 0fdcb100cc799ab083263dbc43a16a56fe5b30d7..417a4cba2e8adf841db79821445cd9bf36f9bdeb 100644 (file)
--- 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 "e_os.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 e93bf33e4ca722361e07d2d3929d8b68b67d6a53..a07ac7e86b6ea0bf47cf35ce9f1c3f608b6ac4be 100644 (file)
--- a/test/cipher_overhead_test.c
+++ b/test/cipher_overhead_test.c
@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "e_os.h"
+#include <internal/nelem.h>
 #include "testutil.h"
 
 #ifdef __VMS

diff --git a/test/cipherbytes_test.c b/test/cipherbytes_test.c
index 6601f7b5d65abe801a00cd615576e54395d750ff..13d6b23aaac89b4b397165b73c22d0f5dbab99ab 100644 (file)
--- a/test/cipherbytes_test.c
+++ b/test/cipherbytes_test.c
@@ -18,7 +18,7 @@
 #include <openssl/ssl3.h>
 #include <openssl/tls1.h>
 
-#include "e_os.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 829042748a45255cf5f925693fcbbe525e66d185..6ec963110e4c160f4c32de7a056344a8f83357ec 100644 (file)
--- a/test/cipherlist_test.c
+++ b/test/cipherlist_test.c
@@ -18,7 +18,7 @@
 #include <openssl/ssl3.h>
 #include <openssl/tls1.h>
 
-#include "e_os.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 f010a3b8bc7469781821c83187bcf49cc73f87e4..0eac902ca9fe815545e5197f0f1ae052387be2c3 100644 (file)
--- a/test/ciphername_test.c
+++ b/test/ciphername_test.c
@@ -19,7 +19,7 @@
 #include <openssl/ssl3.h>
 #include <openssl/tls1.h>
 
-#include "e_os.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 8575194e90ae203859ce31c7560bd9edd26884d1..24cbaf3660d87aa209061e19c4eb1e0ae29aa83c 100644 (file)
--- a/test/constant_time_test.c
+++ b/test/constant_time_test.c
@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "e_os.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 720c13b3a2d1ac1911944addebdfddf625f40da9..f5af4b1e4f983bca13bcde0904dfe2e6d3cb345f 100644 (file)
--- a/test/crltest.c
+++ b/test/crltest.c
@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "../e_os.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 e5ebcfa0276d436ac85a0a73324c3bf80402deed..48edba49466e16478db129678fe7cb8616f18d3d 100644 (file)
--- 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 "e_os.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 d21f554c7e85aa9524050330547bbafbadbc6416..de51c83f56173cfb6187af1af57cd8d25fbd2e59 100644 (file)
--- a/test/danetest.c
+++ b/test/danetest.c
@@ -24,7 +24,7 @@
 #endif
 #include "testutil.h"
 
-#include "e_os.h"
+#include <internal/nelem.h>
 
 #define _UC(c) ((unsigned char)(c))
 

diff --git a/test/dhtest.c b/test/dhtest.c
index 595732c67322a2bffbda7c27982a3bab653f2a88..ac09c445fa4aebe1480ed65791dd00cc61cf8e76 100644 (file)
--- a/test/dhtest.c
+++ b/test/dhtest.c
@@ -11,7 +11,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "e_os.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 62d2dbde64787d81436786802e677660b7c96e34..28d0d905c35ac9bcba9565eeeba9516d6f4c3487 100644 (file)
--- a/test/drbgtest.c
+++ b/test/drbgtest.c
@@ -8,7 +8,7 @@
  */
 
 #include <string.h>
-#include "e_os.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 7c58731df8d9fbfac827c81efe7c57e6186151c0..d25a1d701f76cdad9062957974cd9a558ed0d2d4 100644 (file)
--- a/test/dsatest.c
+++ b/test/dsatest.c
@@ -19,7 +19,7 @@
 #include <openssl/dsa.h>
 
 #include "testutil.h"
-#include "e_os.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 e401ccffddfa15af36e65023fc56273a4207a3dc..00120cc0ab0d8ae85a07c036536c02ed15242512 100644 (file)
--- 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 "e_os.h"
+#include <internal/nelem.h>
 #include "testutil.h"
 
 #ifndef OPENSSL_NO_SOCK

diff --git a/test/ecstresstest.c b/test/ecstresstest.c
index e16ccd59f6befa0be48e72f0ce0874f18cb4a8c4..7c76f02108bfac22adbce45b5ffad4a430ff15fc 100644 (file)
--- a/test/ecstresstest.c
+++ b/test/ecstresstest.c
@@ -8,7 +8,7 @@
  * or in the file LICENSE in the source distribution.
  */
 
-#include "e_os.h"
+#include <internal/nelem.h>
 #include "testutil.h"
 
 #include <stdio.h>

diff --git a/test/ectest.c b/test/ectest.c
index 80e10013a82b2d8e800c6d0c34ab0acc112bb02d..85847e087039c9325de9d0edd67006953d76d488 100644 (file)
--- a/test/ectest.c
+++ b/test/ectest.c
@@ -8,7 +8,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "e_os.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 acccfe5449074e2a2f1488d4ef5cf23c2ac3b2aa..5ca95e4fd64407bf82a00a865939d89f62c53e95 100644 (file)
--- 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 "e_os.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 b357a2349d4bb5350d7e14df775c4bc497af86de..62a2377dfd94bc788a68f222bbaba9f7b41ebc58 100644 (file)
--- a/test/exptest.c
+++ b/test/exptest.c
@@ -11,7 +11,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../e_os.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 d200332771f8dd43739f8308679406c34d8c5668..b33cdd5640f22a4e963552fe00f603feaf6109c7 100644 (file)
--- a/test/handshake_helper.c
+++ b/test/handshake_helper.c
@@ -18,7 +18,7 @@
 
 #ifndef OPENSSL_NO_SOCK
 # define USE_SOCKETS
-# include "e_os.h"
+# include <internal/nelem.h>
 #endif
 
 #include "handshake_helper.h"

diff --git a/test/hmactest.c b/test/hmactest.c
index efe21e0609b975a6326cf287ead5e932afd4a581..abd1193d81974d10ffd34d3a6a7941a85a2963a8 100644 (file)
--- a/test/hmactest.c
+++ b/test/hmactest.c
@@ -11,7 +11,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "../e_os.h"
+#include <internal/nelem.h>
 
 # include <openssl/hmac.h>
 # include <openssl/sha.h>

diff --git a/test/ideatest.c b/test/ideatest.c
index 32fea47ab76613f43d7b7c9f0fcf732b6129309a..5b715fe1c919f0f7b4c628b284699892ec7b7adf 100644 (file)
--- a/test/ideatest.c
+++ b/test/ideatest.c
@@ -9,7 +9,7 @@
 
 #include <string.h>
 
-#include "../e_os.h"
+#include <internal/nelem.h>
 #include "testutil.h"
 
 #ifndef OPENSSL_NO_IDEA

diff --git a/test/igetest.c b/test/igetest.c
index a5c890e3462a9ad70ab7a0dc1ff87062f9a9861d..8a1db677047358064b85bb87580de50e2dfb7cb4 100644 (file)
--- a/test/igetest.c
+++ b/test/igetest.c
@@ -12,7 +12,7 @@
 #include <openssl/rand.h>
 #include <stdio.h>
 #include <string.h>
-#include "e_os.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 704b1807b44ddbb664531b38d3f7739a53d4effe..6deea8d99210c608c6a9676a62f59e179cee38bc 100644 (file)
--- a/test/lhash_test.c
+++ b/test/lhash_test.c
@@ -16,7 +16,7 @@
 #include <openssl/err.h>
 #include <openssl/crypto.h>
 
-#include "e_os.h"
+#include <internal/nelem.h>
 #include "testutil.h"
 
 /*

diff --git a/test/md2test.c b/test/md2test.c
index cda84697afcc9571f84d0109fb5fdfa6b93d1a55..df55932f82d36849a00d378b5607d6b254083a97 100644 (file)
--- a/test/md2test.c
+++ b/test/md2test.c
@@ -9,7 +9,7 @@
 
 #include <string.h>
 
-#include "../e_os.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 2c8d22d9909487da3c3c6badb4ed2affb9df5f5a..c5e74ea5ef5de3790118591ac420898bbdf813b2 100644 (file)
--- a/test/mdc2_internal_test.c
+++ b/test/mdc2_internal_test.c
@@ -14,7 +14,7 @@
 
 #include <openssl/mdc2.h>
 #include "testutil.h"
-#include "e_os.h"
+#include <internal/nelem.h>
 
 typedef struct {
     const char *input;

diff --git a/test/mdc2test.c b/test/mdc2test.c
index 4f2995348097f13e505b06535491549221c431f1..5dfe60e8bfef763b923b11f1ee863c4df06d6c9b 100644 (file)
--- a/test/mdc2test.c
+++ b/test/mdc2test.c
@@ -9,7 +9,7 @@
 
 #include <string.h>
 
-#include "../e_os.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 e2eb3b65d0a725f3e00617a5cd80ab1738659aea..3fd0498b8b71f1375b29ec4368de5924e5b42135 100644 (file)
--- 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 "e_os.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 592f4b6e83dc65e9b1dc412cfb507a6b03e0e0fa..55b76440eaec7a8d5b071ee22458e2610f78c012 100644 (file)
--- 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 "e_os.h"
+#include <internal/nelem.h>
 
 typedef struct {
     size_t size;

diff --git a/test/rc2test.c b/test/rc2test.c
index 6323d81beb19f9f5b2e13c3b59ec26127d8de242..fc00076b17084ee827bf878408a52b64aa6e579b 100644 (file)
--- a/test/rc2test.c
+++ b/test/rc2test.c
@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "../e_os.h"
+#include <internal/nelem.h>
 #include "testutil.h"
 
 #ifndef OPENSSL_NO_RC2

diff --git a/test/rc4test.c b/test/rc4test.c
index b2032fdd340ac6869900fad2ca9ba1ae23b9c82c..e3f41b62089a0555b277ad1b94516294db5a97bd 100644 (file)
--- a/test/rc4test.c
+++ b/test/rc4test.c
@@ -9,7 +9,7 @@
 
 #include <string.h>
 
-#include "../e_os.h"
+#include <internal/nelem.h>
 #include "testutil.h"
 
 #ifndef OPENSSL_NO_RC4

diff --git a/test/rc5test.c b/test/rc5test.c
index 16a0364630514c83ef7112f12a5ed947e3e08893..9aa214f814c2b74fe5acf3100ffc7d59435a07d0 100644 (file)
--- a/test/rc5test.c
+++ b/test/rc5test.c
@@ -9,7 +9,7 @@
 
 #include <string.h>
 
-#include "../e_os.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 55339f90535d42c1f17def3a4000d1f8feebb4e9..13dcde1890225ed8c25ec9acb1981add93c4f546 100644 (file)
--- a/test/rsa_test.c
+++ b/test/rsa_test.c
@@ -12,7 +12,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "e_os.h"
+#include <internal/nelem.h>
 
 #include <openssl/crypto.h>
 #include <openssl/err.h>

diff --git a/test/servername_test.c b/test/servername_test.c
index e0fe4d5eb55a7c186e89d51cd0c04f1e25eaa4fe..f1b66ee510c964d6608378965fb523bfac57b709 100644 (file)
--- a/test/servername_test.c
+++ b/test/servername_test.c
@@ -21,7 +21,7 @@
 #include "../ssl/packet_locl.h"
 
 #include "testutil.h"
-#include "e_os.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 ca24339ee7ec0bade612f372730c79e5bda52732..60a2d8dd019d2af2022383d154ef626eb434ca23 100644 (file)
--- 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 "e_os.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 9d6d2b57596788bb60127a1de7b803b080818432..9f520152146a6cf36ab6f6717b5edfa5e02d180c 100644 (file)
--- 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 "e_os.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 b581cdfb944f760fe9624f2461a7607058bf945a..9dc33951feb16f0d481dbdf1fd182a82f2841b99 100644 (file)
--- 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 "e_os.h"
+#include <internal/nelem.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 f7ffe40197c86191b2143404a3b465e57f2eaf74..2376ce178f896d342b3a87f589166c84c3dbea13 100644 (file)
--- 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 "e_os.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 1c43686d2c1f3440a43d88a877af750fc65c672a..dfcbf11c902edc60ceb15ceb7710ac380684970a 100644 (file)
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -17,7 +17,7 @@
 
 #include "ssltestlib.h"
 #include "testutil.h"
-#include "e_os.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 3a8d9b26375cd301ccb8fbd95ec09a9a3feca3c2..9e3bb7a83d4891593ffa9dfd70b2a015ba54ae54 100644 (file)
--- a/test/ssltest_old.c
+++ b/test/ssltest_old.c
@@ -25,6 +25,8 @@
 #include <string.h>
 #include <time.h>
 
+#include <internal/nelem.h>
+
 #define USE_SOCKETS
 #include "e_os.h"
 

diff --git a/test/ssltestlib.c b/test/ssltestlib.c
index 64acea3f7dc6d3cbd06b13f7946085feb0080f2f..410d323a9ab849402f3d068139816e21207cc2cf 100644 (file)
--- a/test/ssltestlib.c
+++ b/test/ssltestlib.c
@@ -9,7 +9,7 @@
 
 #include <string.h>
 
-#include "e_os.h"
+#include <internal/nelem.h>
 #include "ssltestlib.h"
 #include "testutil.h"
 

diff --git a/test/stack_test.c b/test/stack_test.c
index ba2ceaf415df6746138d673f3e378588ea39a80e..922dfdd41c8824495c52724797a4426e532d070a 100644 (file)
--- a/test/stack_test.c
+++ b/test/stack_test.c
@@ -16,7 +16,7 @@
 #include <openssl/err.h>
 #include <openssl/crypto.h>
 
-#include "e_os.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 ae16d8285c2cdb7ce56a7ec0f1d7f160ce7d47b2..742cd61a6fbcf5e9ae6648636cef21592efa792f 100644 (file)
--- a/test/test_test.c
+++ b/test/test_test.c
@@ -16,7 +16,7 @@
 #include <openssl/crypto.h>
 #include <openssl/bn.h>
 
-#include "e_os.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 274d3cde721a4eac69e01a5f2644bc64ba779d2b..1859706996c7df17472d7958a5edbe3f562d9a70 100644 (file)
--- a/test/testutil/driver.c
+++ b/test/testutil/driver.c
@@ -14,7 +14,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "../../e_os.h"
+#include <internal/nelem.h>
 #include <openssl/bio.h>
 
 /*

diff --git a/test/testutil/format_output.c b/test/testutil/format_output.c
index ae3bf0ef7703877b4825a500ae3abe688e38a5d5..13123d5c6a6a767d8c11b8d49208a1eef261cd79 100644 (file)
--- a/test/testutil/format_output.c
+++ b/test/testutil/format_output.c
@@ -13,7 +13,7 @@
 
 #include <string.h>
 #include <ctype.h>
-#include "../../e_os.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 34abcb2ce7d94e870a297074e50755d4f5e9a9d8..2f4eeb6798ff71d4021a9d8d5f10a1340cf3f837 100644 (file)
--- a/test/testutil/main.c
+++ b/test/testutil/main.c
@@ -8,7 +8,7 @@
  */
 
 #include "../testutil.h"
-#include "../../e_os.h"
+#include <internal/nelem.h>
 #include "output.h"
 #include "tu_local.h"
 

diff --git a/test/testutil/stanza.c b/test/testutil/stanza.c
index 8a8f0cc8f4f04bfdc6a23bfa13e62ba118f7ddfc..35967528f8312c4c918175a6d3f6d2a558b55b4d 100644 (file)
--- a/test/testutil/stanza.c
+++ b/test/testutil/stanza.c
@@ -12,7 +12,7 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "e_os.h"
+#include "internal/nelem.h"
 #include "../testutil.h"
 #include "tu_local.h"
 

diff --git a/test/testutil/tests.c b/test/testutil/tests.c
index b2d95db8593b08472e74344e558eeef5bf8c4492..cea81ca2ec6b82b9c0781f42d35f4a206e094406 100644 (file)
--- a/test/testutil/tests.c
+++ b/test/testutil/tests.c
@@ -14,7 +14,7 @@
 #include <errno.h>
 #include <string.h>
 #include <ctype.h>
-#include "../../e_os.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 b7f1e87367a6e2a0783fb27a3266a9894b78bdef..8814ccb47ab6b4e447acb4ee25f288bffd67d6f7 100644 (file)
--- 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 "e_os.h"
+#include <internal/nelem.h>
 
 typedef struct {
     const char *data;

diff --git a/test/v3nametest.c b/test/v3nametest.c
index 0f89260c05c5d16a3d45c79b53a7d86cc9bb3aa3..36f8df646c2a11f8933db2fe90533bb5bf025a55 100644 (file)
--- a/test/v3nametest.c
+++ b/test/v3nametest.c
@@ -8,7 +8,7 @@
  */
 
 #include <string.h>
-#include "e_os.h"
+#include <internal/nelem.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 #include "testutil.h"

diff --git a/test/x509_internal_test.c b/test/x509_internal_test.c
index 17517cd7c818be095957e09b76ba2d3e5f160aca..930c01ce7bb8e8fef73ab2963b759c6b3845598e 100644 (file)
--- 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 "e_os.h"
+#include <internal/nelem.h>
 
 /**********************************************************************
  *

diff --git a/test/x509_time_test.c b/test/x509_time_test.c
index 7790b821e748e6487e4ea92ef3b362e1bc34e02d..e8cec0cfeaaa4249d9bde8c95839ce79b17a4929 100644 (file)
--- 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 "e_os.h"
+#include <internal/nelem.h>
 
 typedef struct {
     const char *data;

diff --git a/test/x509aux.c b/test/x509aux.c
index 13a2ffc6a5e3bb4fafce6091962649a9504e650f..d38aeb026388f3ee330239d767ff990a5f1dfa1a 100644 (file)
--- 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 "e_os.h"
+#include <internal/nelem.h>
 #include "testutil.h"
 
 static int test_certs(int num)