openssl
/
openssl
mirror of https://github.com/openssl/openssl
1
0
Fork 0
Code Issues Releases Wiki Activity

test cleanup: move helper .c and .h files to test/helpers/ 

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13568)
This commit is contained in:
Dr. David von Oheimb 2020-11-29 12:40:10 +01:00
parent 93a9ffa6c2
commit 20f8bc7255
42 changed files with 79 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/asynciotest.c
View File

@ -15,7 +15,7 @@
#include "internal/packet.h"
#include "ssltestlib.h"
#include "helpers/ssltestlib.h"
#include "testutil.h"
/* Should we fragment records or not? 0 = no, !0 = yes*/

68
test/build.info
View File

@ -18,7 +18,7 @@ $LIBAPPSSRC=../apps/lib/opt.c $AUXLIBAPPSSRC
IF[{- !$disabled{tests} -}]
LIBS{noinst,has_main}=libtestutil.a
SOURCE[libtestutil.a]=testutil/basic_output.c testutil/output_helpers.c \
SOURCE[libtestutil.a]=testutil/basic_output.c testutil/output.c \
testutil/driver.c testutil/tests.c testutil/cb.c testutil/stanza.c \
testutil/format_output.c \
testutil/test_cleanup.c testutil/main.c testutil/testutil_init.c \
@ -122,11 +122,11 @@ IF[{- !$disabled{tests} -}]
INCLUDE[exptest]=../include ../apps/include
DEPEND[exptest]=../libcrypto libtestutil.a
SOURCE[fatalerrtest]=fatalerrtest.c ssltestlib.c
SOURCE[fatalerrtest]=fatalerrtest.c helpers/ssltestlib.c
INCLUDE[fatalerrtest]=../include ../apps/include
DEPEND[fatalerrtest]=../libcrypto ../libssl libtestutil.a
SOURCE[tls13ccstest]=tls13ccstest.c ssltestlib.c
SOURCE[tls13ccstest]=tls13ccstest.c helpers/ssltestlib.c
INCLUDE[tls13ccstest]=../include ../apps/include
DEPEND[tls13ccstest]=../libcrypto ../libssl libtestutil.a
@ -242,7 +242,7 @@ IF[{- !$disabled{tests} -}]
INCLUDE[memleaktest]=../include ../apps/include
DEPEND[memleaktest]=../libcrypto libtestutil.a
SOURCE[pkcs12_format_test]=pkcs12_format_test.c pkcs12_helper.c
SOURCE[pkcs12_format_test]=pkcs12_format_test.c helpers/pkcs12.c
INCLUDE[pkcs12_format_test]=../include ../apps/include
DEPEND[pkcs12_format_test]=../libcrypto libtestutil.a
@ -274,11 +274,11 @@ IF[{- !$disabled{tests} -}]
INCLUDE[d2i_test]=../include ../apps/include
DEPEND[d2i_test]=../libcrypto libtestutil.a
SOURCE[ssl_test_ctx_test]=ssl_test_ctx_test.c ssl_test_ctx.c
SOURCE[ssl_test_ctx_test]=ssl_test_ctx_test.c helpers/ssl_test_ctx.c
INCLUDE[ssl_test_ctx_test]=../include ../apps/include
DEPEND[ssl_test_ctx_test]=../libcrypto ../libssl libtestutil.a
SOURCE[ssl_test]=ssl_test.c ssl_test_ctx.c handshake_helper.c
SOURCE[ssl_test]=ssl_test.c helpers/ssl_test_ctx.c helpers/handshake.c
INCLUDE[ssl_test]=../include ../apps/include
DEPEND[ssl_test]=../libcrypto ../libssl libtestutil.a
@ -286,17 +286,17 @@ IF[{- !$disabled{tests} -}]
INCLUDE[cipherlist_test]=../include ../apps/include
DEPEND[cipherlist_test]=../libcrypto ../libssl libtestutil.a
INCLUDE[ssl_test_ctx.o]=../include
INCLUDE[handshake_helper.o]=.. ../include
INCLUDE[pkcs12_helper.o]=.. ../include
INCLUDE[ssltestlib.o]=.. ../include
INCLUDE[cmp_testlib.o]=.. ../include ../apps/include
INCLUDE[helpers/ssl_test_ctx.o]=../include
INCLUDE[helpers/handshake.o]=.. ../include
INCLUDE[helpers/pkcs12.o]=.. ../include
INCLUDE[helpers/ssltestlib.o]=.. ../include
INCLUDE[helpers/cmp_testlib.o]=.. ../include ../apps/include
SOURCE[x509aux]=x509aux.c
INCLUDE[x509aux]=../include ../apps/include
DEPEND[x509aux]=../libcrypto libtestutil.a
SOURCE[asynciotest]=asynciotest.c ssltestlib.c
SOURCE[asynciotest]=asynciotest.c helpers/ssltestlib.c
INCLUDE[asynciotest]=../include ../apps/include
DEPEND[asynciotest]=../libcrypto ../libssl libtestutil.a
@ -324,7 +324,7 @@ IF[{- !$disabled{tests} -}]
INCLUDE[param_build_test]=../include ../apps/include
DEPEND[param_build_test]=../libcrypto.a libtestutil.a
SOURCE[sslapitest]=sslapitest.c ssltestlib.c filterprov.c tls-provider.c
SOURCE[sslapitest]=sslapitest.c helpers/ssltestlib.c filterprov.c tls-provider.c
INCLUDE[sslapitest]=../include ../apps/include ..
DEPEND[sslapitest]=../libcrypto ../libssl libtestutil.a
@ -344,11 +344,11 @@ IF[{- !$disabled{tests} -}]
INCLUDE[http_test]=../include ../apps/include
DEPEND[http_test]=../libcrypto libtestutil.a
SOURCE[dtlstest]=dtlstest.c ssltestlib.c
SOURCE[dtlstest]=dtlstest.c helpers/ssltestlib.c
INCLUDE[dtlstest]=../include ../apps/include
DEPEND[dtlstest]=../libcrypto ../libssl libtestutil.a
SOURCE[sslcorrupttest]=sslcorrupttest.c ssltestlib.c
SOURCE[sslcorrupttest]=sslcorrupttest.c helpers/ssltestlib.c
INCLUDE[sslcorrupttest]=../include ../apps/include
DEPEND[sslcorrupttest]=../libcrypto ../libssl libtestutil.a
@ -376,7 +376,7 @@ IF[{- !$disabled{tests} -}]
INCLUDE[x509_time_test]=../include ../apps/include
DEPEND[x509_time_test]=../libcrypto libtestutil.a
SOURCE[recordlentest]=recordlentest.c ssltestlib.c
SOURCE[recordlentest]=recordlentest.c helpers/ssltestlib.c
INCLUDE[recordlentest]=../include ../apps/include
DEPEND[recordlentest]=../libcrypto ../libssl libtestutil.a
@ -412,7 +412,7 @@ IF[{- !$disabled{tests} -}]
INCLUDE[http_test]=../include ../apps/include
DEPEND[http_test]=../libcrypto libtestutil.a
SOURCE[servername_test]=servername_test.c ssltestlib.c
SOURCE[servername_test]=servername_test.c helpers/ssltestlib.c
INCLUDE[servername_test]=../include ../apps/include
DEPEND[servername_test]=../libcrypto ../libssl libtestutil.a
@ -425,7 +425,7 @@ IF[{- !$disabled{tests} -}]
IF[{- !$disabled{psk} -}]
PROGRAMS{noinst}=dtls_mtu_test
SOURCE[dtls_mtu_test]=dtls_mtu_test.c ssltestlib.c
SOURCE[dtls_mtu_test]=dtls_mtu_test.c helpers/ssltestlib.c
INCLUDE[dtls_mtu_test]=.. ../include ../apps/include
DEPEND[dtls_mtu_test]=../libcrypto ../libssl libtestutil.a
ENDIF
@ -477,39 +477,39 @@ IF[{- !$disabled{tests} -}]
cmp_server_test cmp_client_test
ENDIF
SOURCE[cmp_asn_test]=cmp_asn_test.c cmp_testlib.c
SOURCE[cmp_asn_test]=cmp_asn_test.c helpers/cmp_testlib.c
INCLUDE[cmp_asn_test]=.. ../include ../apps/include
DEPEND[cmp_asn_test]=../libcrypto.a libtestutil.a
SOURCE[cmp_ctx_test]=cmp_ctx_test.c cmp_testlib.c
SOURCE[cmp_ctx_test]=cmp_ctx_test.c helpers/cmp_testlib.c
INCLUDE[cmp_ctx_test]=.. ../include ../apps/include
DEPEND[cmp_ctx_test]=../libcrypto.a libtestutil.a
SOURCE[cmp_hdr_test]=cmp_hdr_test.c cmp_testlib.c
SOURCE[cmp_hdr_test]=cmp_hdr_test.c helpers/cmp_testlib.c
INCLUDE[cmp_hdr_test]=.. ../include ../apps/include
DEPEND[cmp_hdr_test]=../libcrypto.a libtestutil.a
SOURCE[cmp_status_test]=cmp_status_test.c cmp_testlib.c
SOURCE[cmp_status_test]=cmp_status_test.c helpers/cmp_testlib.c
INCLUDE[cmp_status_test]=.. ../include ../apps/include
DEPEND[cmp_status_test]=../libcrypto.a libtestutil.a
SOURCE[cmp_protect_test]=cmp_protect_test.c cmp_testlib.c
SOURCE[cmp_protect_test]=cmp_protect_test.c helpers/cmp_testlib.c
INCLUDE[cmp_protect_test]=.. ../include ../apps/include
DEPEND[cmp_protect_test]=../libcrypto.a libtestutil.a
SOURCE[cmp_msg_test]=cmp_msg_test.c cmp_testlib.c
SOURCE[cmp_msg_test]=cmp_msg_test.c helpers/cmp_testlib.c
INCLUDE[cmp_msg_test]=.. ../include ../apps/include
DEPEND[cmp_msg_test]=../libcrypto.a libtestutil.a
SOURCE[cmp_vfy_test]=cmp_vfy_test.c cmp_testlib.c
SOURCE[cmp_vfy_test]=cmp_vfy_test.c helpers/cmp_testlib.c
INCLUDE[cmp_vfy_test]=.. ../include ../apps/include
DEPEND[cmp_vfy_test]=../libcrypto.a libtestutil.a
SOURCE[cmp_server_test]=cmp_server_test.c cmp_testlib.c
SOURCE[cmp_server_test]=cmp_server_test.c helpers/cmp_testlib.c
INCLUDE[cmp_server_test]=.. ../include ../apps/include
DEPEND[cmp_server_test]=../libcrypto.a libtestutil.a
SOURCE[cmp_client_test]=cmp_client_test.c cmp_testlib.c ../apps/cmp_mock_srv.c
SOURCE[cmp_client_test]=cmp_client_test.c helpers/cmp_testlib.c ../apps/cmp_mock_srv.c
INCLUDE[cmp_client_test]=.. ../include ../apps/include
DEPEND[cmp_client_test]=../libcrypto.a libtestutil.a
@ -526,7 +526,7 @@ IF[{- !$disabled{tests} -}]
rsa_sp800_56b_test bn_internal_test ecdsatest rsa_test \
rc2test rc4test rc5test hmactest ffc_internal_test \
asn1_dsa_internal_test dsatest dsa_no_digest_size_test \
dhtest ssltest_old
dhtest ssl_old_test
IF[{- !$disabled{poly1305} -}]
PROGRAMS{noinst}=poly1305_internal_test
@ -700,9 +700,9 @@ IF[{- !$disabled{tests} -}]
INCLUDE[mdc2_internal_test]=.. ../include ../apps/include
DEPEND[mdc2_internal_test]=../libcrypto.a libtestutil.a
SOURCE[ssltest_old]=ssltest_old.c predefined_dhparams.c
INCLUDE[ssltest_old]=.. ../include ../apps/include
DEPEND[ssltest_old]=../libcrypto.a ../libssl.a
SOURCE[ssl_old_test]=ssl_old_test.c helpers/predefined_dhparams.c
INCLUDE[ssl_old_test]=.. ../include ../apps/include
DEPEND[ssl_old_test]=../libcrypto.a ../libssl.a
ENDIF
PROGRAMS{noinst}=asn1_time_test
@ -722,7 +722,7 @@ IF[{- !$disabled{tests} -}]
DEPEND[tls13secretstest]=../libcrypto ../libssl libtestutil.a
ENDIF
SOURCE[sslbuffertest]=sslbuffertest.c ssltestlib.c
SOURCE[sslbuffertest]=sslbuffertest.c helpers/ssltestlib.c
INCLUDE[sslbuffertest]=../include ../apps/include
DEPEND[sslbuffertest]=../libcrypto ../libssl libtestutil.a
@ -734,7 +734,7 @@ IF[{- !$disabled{tests} -}]
INCLUDE[errtest]=../include ../apps/include
DEPEND[errtest]=../libcrypto libtestutil.a
SOURCE[gosttest]=gosttest.c ssltestlib.c
SOURCE[gosttest]=gosttest.c helpers/ssltestlib.c
INCLUDE[gosttest]=../include ../apps/include ..
DEPEND[gosttest]=../libcrypto ../libssl libtestutil.a
@ -789,7 +789,7 @@ IF[{- !$disabled{tests} -}]
DEPEND[hexstr_test]=../libcrypto.a libtestutil.a
PROGRAMS{noinst}=endecode_test
SOURCE[endecode_test]=endecode_test.c predefined_dhparams.c
SOURCE[endecode_test]=endecode_test.c helpers/predefined_dhparams.c
INCLUDE[endecode_test]=.. ../include ../apps/include
DEPEND[endecode_test]=../libcrypto.a libtestutil.a

2
test/cmp_asn_test.c
View File

@ -9,7 +9,7 @@
* https://www.openssl.org/source/license.html
*/
#include "cmp_testlib.h"
#include "helpers/cmp_testlib.h"
static unsigned char rand_data[OSSL_CMP_TRANSACTIONID_LENGTH];

2
test/cmp_client_test.c
View File

@ -9,7 +9,7 @@
* https://www.openssl.org/source/license.html
*/
#include "cmp_testlib.h"
#include "helpers/cmp_testlib.h"
#include "apps/cmp_mock_srv.h"

2
test/cmp_ctx_test.c
View File

@ -9,7 +9,7 @@
* https://www.openssl.org/source/license.html
*/
#include "cmp_testlib.h"
#include "helpers/cmp_testlib.h"
#include <openssl/x509_vfy.h>

2
test/cmp_hdr_test.c
View File

@ -9,7 +9,7 @@
* https://www.openssl.org/source/license.html
*/
#include "cmp_testlib.h"
#include "helpers/cmp_testlib.h"
static unsigned char rand_data[OSSL_CMP_TRANSACTIONID_LENGTH];

2
test/cmp_msg_test.c
View File

@ -9,7 +9,7 @@
* https://www.openssl.org/source/license.html
*/
#include "cmp_testlib.h"
#include "helpers/cmp_testlib.h"
static const char *newkey_f;
static const char *server_cert_f;

2
test/cmp_protect_test.c
View File

@ -9,7 +9,7 @@
* https://www.openssl.org/source/license.html
*/
#include "cmp_testlib.h"
#include "helpers/cmp_testlib.h"
static const char *ir_protected_f;
static const char *ir_unprotected_f;

2
test/cmp_server_test.c
View File

@ -9,7 +9,7 @@
* https://www.openssl.org/source/license.html
*/
#include "cmp_testlib.h"
#include "helpers/cmp_testlib.h"
typedef struct test_fixture {
const char *test_case_name;

2
test/cmp_status_test.c
View File

@ -9,7 +9,7 @@
* https://www.openssl.org/source/license.html
*/
#include "cmp_testlib.h"
#include "helpers/cmp_testlib.h"
typedef struct test_fixture {
const char *test_case_name;

2
test/cmp_vfy_test.c
View File

@ -9,7 +9,7 @@
* https://www.openssl.org/source/license.html
*/
#include "cmp_testlib.h"
#include "helpers/cmp_testlib.h"
#include "../crypto/crmf/crmf_local.h" /* for manipulating POPO signature */
static const char *server_f;

2
test/dtls_mtu_test.c
View File

@ -14,7 +14,7 @@
#include <openssl/ssl.h>
#include <openssl/err.h>
#include "ssltestlib.h"
#include "helpers/ssltestlib.h"
#include "testutil.h"
/* for SSL_READ_ETM() */

2
test/dtlstest.c
View File

@ -13,7 +13,7 @@
#include <openssl/ssl.h>
#include <openssl/err.h>
#include "ssltestlib.h"
#include "helpers/ssltestlib.h"
#include "testutil.h"
static char *cert = NULL;

2
test/endecode_test.c
View File

@ -22,7 +22,7 @@
#include "internal/cryptlib.h" /* ossl_assert */
#include "crypto/pem.h" /* For PVK and "blob" PEM headers */
#include "predefined_dhparams.h"
#include "helpers/predefined_dhparams.h"
#include "testutil.h"
#ifndef OPENSSL_NO_EC

4
test/evp_test.c
View File

@ -26,7 +26,9 @@
#include "internal/nelem.h"
#include "crypto/evp.h"
#include "testutil.h"
#include "evp_test.h"
typedef struct evp_test_buffer_st EVP_TEST_BUFFER;
DEFINE_STACK_OF(EVP_TEST_BUFFER)
#define AAD_NUM 4

11
test/evp_test.h
View File

@ -1,11 +0,0 @@
/*
* Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (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
*/
typedef struct evp_test_buffer_st EVP_TEST_BUFFER;
DEFINE_STACK_OF(EVP_TEST_BUFFER)

2
test/fatalerrtest.c
View File

@ -9,7 +9,7 @@
#include <openssl/ssl.h>
#include <openssl/err.h>
#include "ssltestlib.h"
#include "helpers/ssltestlib.h"
#include "testutil.h"
#include <string.h>

2
test/gosttest.c
View File

@ -7,7 +7,7 @@
* https://www.openssl.org/source/license.html
*/
#include "ssltestlib.h"
#include "helpers/ssltestlib.h"
#include "testutil.h"
#include "internal/nelem.h"

0
test/cmp_testlib.c → test/helpers/cmp_testlib.c
View File

5
test/cmp_testlib.h → test/helpers/cmp_testlib.h
View File

@ -17,9 +17,8 @@
# include <openssl/rand.h>
# include "crypto/x509.h" /* for x509_set0_libctx() and x509_dup_ex() */
# include "../crypto/cmp/cmp_local.h"
# include "testutil.h"
# include "../../crypto/cmp/cmp_local.h"
# include "../testutil.h"
# ifndef OPENSSL_NO_CMP
# define CMP_TEST_REFVALUE_LENGTH 15 /* arbitrary value */

6
test/handshake_helper.c → test/helpers/handshake.c
View File

@ -16,11 +16,11 @@
#include <openssl/srp.h>
#endif
#include "../ssl/ssl_local.h"
#include "../../ssl/ssl_local.h"
#include "internal/sockets.h"
#include "internal/nelem.h"
#include "handshake_helper.h"
#include "testutil.h"
#include "handshake.h"
#include "../testutil.h"
#if !defined(OPENSSL_NO_SCTP) && !defined(OPENSSL_NO_SOCK)
#include <netinet/sctp.h>

0
test/handshake_helper.h → test/helpers/handshake.h
View File

4
test/pkcs12_helper.c → test/helpers/pkcs12.c
View File

@ -18,8 +18,8 @@
#include <openssl/x509v3.h>
#include <openssl/pem.h>
#include "testutil.h"
#include "pkcs12_helper.h"
#include "../testutil.h"
#include "pkcs12.h" /* from the same directory */
/* Set this to > 0 write test data to file */
int write_files = 0;

2
test/pkcs12_helper.h → test/helpers/pkcs12.h
View File

@ -18,7 +18,7 @@
#include <openssl/x509v3.h>
#include <openssl/pem.h>
#include "testutil.h"
#include "../testutil.h"
/* Set this to > 0 write test data to file */
extern int write_files;

0
test/predefined_dhparams.c → test/helpers/predefined_dhparams.c
View File

0
test/predefined_dhparams.h → test/helpers/predefined_dhparams.h
View File

2
test/ssl_test_ctx.c → test/helpers/ssl_test_ctx.c
View File

@ -14,7 +14,7 @@
#include "internal/nelem.h"
#include "ssl_test_ctx.h"
#include "testutil.h"
#include "../testutil.h"
#ifdef OPENSSL_SYS_WINDOWS
# define strcasecmp _stricmp

0
test/ssl_test_ctx.h → test/helpers/ssl_test_ctx.h
View File

2
test/ssltestlib.c → test/helpers/ssltestlib.c
View File

@ -12,7 +12,7 @@
#include "internal/nelem.h"
#include "internal/cryptlib.h" /* for ossl_sleep() */
#include "ssltestlib.h"
#include "testutil.h"
#include "../testutil.h"
#include "e_os.h"
#ifdef OPENSSL_SYS_UNIX

0
test/ssltestlib.h → test/helpers/ssltestlib.h
View File

2
test/pkcs12_format_test.c
View File

@ -19,7 +19,7 @@
#include <openssl/pem.h>
#include "testutil.h"
#include "pkcs12_helper.h"
#include "helpers/pkcs12.h"
/* --------------------------------------------------------------------------

12
test/recipes/80-test_ssl_old.t
View File

@ -75,7 +75,7 @@ my $P2intermediate="tmp_intP2.ss";
my $server_sess="server.ss";
my $client_sess="client.ss";
# ssltest_old.c is deprecated in favour of the new framework in ssl_test.c
# ssl_old_test.c is deprecated in favour of the new framework in ssl_test.c
# If you're adding tests here, you probably want to convert them to the
# new format in ssl_test.c and add recipes to 80-test_ssl_new.t instead.
plan tests =>
@ -333,7 +333,7 @@ sub testssl {
push @providerflags, "-provider", "legacy";
}
my @ssltest = ("ssltest_old",
my @ssltest = ("ssl_old_test",
"-s_key", $key, "-s_cert", $cert,
"-c_key", $key, "-c_cert", $cert,
"-config", $configfile,
@ -438,7 +438,7 @@ sub testssl {
}
my @protocols = ();
# We only use the flags that ssltest_old understands
# We only use the flags that ssl_old_test understands
push @protocols, "-tls1_3" unless $no_tls1_3;
push @protocols, "-tls1_2" unless $no_tls1_2;
push @protocols, "-tls1" unless $no_tls1 || $provider eq "fips";
@ -482,7 +482,7 @@ sub testssl {
foreach my $protocol (sort keys %ciphersuites) {
note "Testing ciphersuites for $protocol";
# ssltest_old doesn't know -tls1_3, but that's fine, since that's
# ssl_old_test doesn't know -tls1_3, but that's fine, since that's
# the default choice if TLSv1.3 enabled
my $flag = $protocol eq "-tls1_3" ? "" : $protocol;
my $ciphersuites = "";
@ -541,13 +541,13 @@ sub testssl {
skip "skipping RSA tests", 2
if $no_rsa;
ok(run(test(["ssltest_old", "-provider", "default", "-v", "-bio_pair", "-tls1", "-s_cert", srctop_file("apps","server2.pem"), "-no_dhe", "-no_ecdhe", "-num", "10", "-f", "-time"])),
ok(run(test(["ssl_old_test", "-provider", "default", "-v", "-bio_pair", "-tls1", "-s_cert", srctop_file("apps","server2.pem"), "-no_dhe", "-no_ecdhe", "-num", "10", "-f", "-time"])),
'test tlsv1 with 1024bit RSA, no (EC)DHE, multiple handshakes');
skip "skipping RSA+DHE tests", 1
if $no_dh;
ok(run(test(["ssltest_old", "-provider", "default", "-v", "-bio_pair", "-tls1", "-s_cert", srctop_file("apps","server2.pem"), "-dhe1024dsa", "-num", "10", "-f", "-time"])),
ok(run(test(["ssl_old_test", "-provider", "default", "-v", "-bio_pair", "-tls1", "-s_cert", srctop_file("apps","server2.pem"), "-dhe1024dsa", "-num", "10", "-f", "-time"])),
'test tlsv1 with 1024bit RSA, 1024bit DHE, multiple handshakes');
}

2
test/recordlentest.c
View File

@ -9,7 +9,7 @@
#include <string.h>
#include "ssltestlib.h"
#include "helpers/ssltestlib.h"
#include "testutil.h"
static char *cert = NULL;

2
test/servername_test.c
View File

@ -22,7 +22,7 @@
#include "testutil.h"
#include "internal/nelem.h"
#include "ssltestlib.h"
#include "helpers/ssltestlib.h"
#define CLIENT_VERSION_LEN 2

2
test/ssltest_old.c → test/ssl_old_test.c
View File

@ -72,7 +72,7 @@
# include <unistd.h>
#endif
#include "predefined_dhparams.h"
#include "helpers/predefined_dhparams.h"
static SSL_CTX *s_ctx = NULL;
static SSL_CTX *s_ctx2 = NULL;

4
test/ssl_test.c
View File

@ -15,8 +15,8 @@
#include <openssl/ssl.h>
#include <openssl/provider.h>
#include "handshake_helper.h"
#include "ssl_test_ctx.h"
#include "helpers/handshake.h"
#include "helpers/ssl_test_ctx.h"
#include "testutil.h"
static CONF *conf = NULL;

2
test/ssl_test_ctx_test.c
View File

@ -16,7 +16,7 @@
#include <string.h>
#include "internal/nelem.h"
#include "ssl_test_ctx.h"
#include "helpers/ssl_test_ctx.h"
#include "testutil.h"
#include <openssl/e_os2.h>
#include <openssl/err.h>

2
test/sslapitest.c
View File

@ -32,7 +32,7 @@
#include <openssl/provider.h>
#include <openssl/param_build.h>
#include "ssltestlib.h"
#include "helpers/ssltestlib.h"
#include "testutil.h"
#include "testutil/output.h"
#include "internal/nelem.h"

2
test/sslbuffertest.c
View File

@ -15,7 +15,7 @@
#include "internal/packet.h"
#include "ssltestlib.h"
#include "helpers/ssltestlib.h"
#include "testutil.h"
struct async_ctrs {

2
test/sslcorrupttest.c
View File

@ -8,7 +8,7 @@
*/
#include <string.h>
#include "ssltestlib.h"
#include "helpers/ssltestlib.h"
#include "testutil.h"
static int docorrupt = 0;

0
test/testutil/output_helpers.c → test/testutil/output.c
View File

2
test/tls13ccstest.c
View File

@ -9,7 +9,7 @@
#include <openssl/ssl.h>
#include <string.h>
#include "ssltestlib.h"
#include "helpers/ssltestlib.h"
#include "testutil.h"
#include "internal/packet.h"