2018-11-04 01:26:35 +08:00
|
|
|
SUBDIRS=ossl_shim
|
2019-06-16 18:56:21 +08:00
|
|
|
|
2019-08-29 04:27:47 +08:00
|
|
|
# TODO: use ../apps/libapps.a instead of direct ../apps/lib source.
|
2019-06-16 18:56:21 +08:00
|
|
|
# This can't currently be done, because some of its units drag in too many
|
2019-08-29 04:27:47 +08:00
|
|
|
# unresolved references that don't apply here.
|
|
|
|
# Most of all, ../apps/lib/apps.c needs to be divided in smaller pieces to
|
|
|
|
# be useful here.
|
2019-06-16 18:56:21 +08:00
|
|
|
#
|
2019-12-01 07:18:47 +08:00
|
|
|
# Auxiliary program source (copied from ../apps/build.info)
|
2019-06-16 18:56:21 +08:00
|
|
|
IF[{- $config{target} =~ /^(?:VC-|mingw)/ -}]
|
|
|
|
# It's called 'init', but doesn't have much 'init' in it...
|
2019-08-29 04:27:47 +08:00
|
|
|
$AUXLIBAPPSSRC=../apps/lib/win32_init.c
|
2019-06-16 18:56:21 +08:00
|
|
|
ENDIF
|
|
|
|
IF[{- $config{target} =~ /^vms-/ -}]
|
2019-08-29 04:27:47 +08:00
|
|
|
$AUXLIBAPPSSRC=../apps/lib/vms_term_sock.c ../apps/lib/vms_decc_argv.c
|
2019-06-16 18:56:21 +08:00
|
|
|
ENDIF
|
2019-11-27 23:13:12 +08:00
|
|
|
$LIBAPPSSRC=../apps/lib/opt.c $AUXLIBAPPSSRC
|
2019-06-16 18:56:21 +08:00
|
|
|
|
2016-04-14 20:44:15 +08:00
|
|
|
IF[{- !$disabled{tests} -}]
|
2019-01-31 01:18:34 +08:00
|
|
|
LIBS{noinst,has_main}=libtestutil.a
|
2017-04-28 20:46:18 +08:00
|
|
|
SOURCE[libtestutil.a]=testutil/basic_output.c testutil/output_helpers.c \
|
2017-06-06 01:32:05 +08:00
|
|
|
testutil/driver.c testutil/tests.c testutil/cb.c testutil/stanza.c \
|
2020-06-05 22:55:42 +08:00
|
|
|
testutil/format_output.c \
|
2019-11-14 01:39:51 +08:00
|
|
|
testutil/test_cleanup.c testutil/main.c testutil/testutil_init.c \
|
2020-08-12 13:46:57 +08:00
|
|
|
testutil/options.c testutil/test_options.c testutil/provider.c \
|
2019-07-26 10:56:01 +08:00
|
|
|
testutil/apps_mem.c testutil/random.c $LIBAPPSSRC
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[libtestutil.a]=../include ../apps/include ..
|
2017-04-18 22:27:27 +08:00
|
|
|
DEPEND[libtestutil.a]=../libcrypto
|
|
|
|
|
2020-02-13 09:00:57 +08:00
|
|
|
PROGRAMS{noinst}= \
|
2019-08-19 12:35:54 +08:00
|
|
|
confdump \
|
2018-03-26 17:00:05 +08:00
|
|
|
versions \
|
2019-09-19 13:39:13 +08:00
|
|
|
aborttest test_test pkcs12_format_test \
|
2018-09-17 06:09:25 +08:00
|
|
|
sanitytest rsa_complex exdatatest bntest \
|
2020-01-28 13:14:18 +08:00
|
|
|
ectest ecstresstest gmdifftest pbelutest \
|
2017-05-12 07:31:18 +08:00
|
|
|
destest mdc2test \
|
2020-02-13 09:00:57 +08:00
|
|
|
exptest \
|
2020-06-16 00:48:39 +08:00
|
|
|
evp_pkey_provided_test evp_test evp_extra_test evp_extra_test2 \
|
2020-09-10 14:40:24 +08:00
|
|
|
evp_fetch_prov_test acvp_test evp_libctx_test ossl_store_test \
|
2019-12-06 01:09:49 +08:00
|
|
|
v3nametest v3ext \
|
2020-06-16 00:48:39 +08:00
|
|
|
evp_pkey_provided_test evp_test evp_extra_test evp_extra_test2 \
|
|
|
|
evp_fetch_prov_test v3nametest v3ext \
|
2019-01-24 10:15:54 +08:00
|
|
|
crltest danetest bad_dtls_test lhash_test sparse_array_test \
|
2019-05-21 05:42:26 +08:00
|
|
|
conf_include_test params_api_test params_conversion_test \
|
2016-04-14 20:44:15 +08:00
|
|
|
constant_time_test verify_extra_test clienthellotest \
|
2017-03-14 10:37:26 +08:00
|
|
|
packettest asynctest secmemtest srptest memleaktest stack_test \
|
2016-04-14 20:44:15 +08:00
|
|
|
dtlsv1listentest ct_test threadstest afalgtest d2i_test \
|
2016-05-26 20:47:47 +08:00
|
|
|
ssl_test_ctx_test ssl_test x509aux cipherlist_test asynciotest \
|
2019-07-17 14:59:09 +08:00
|
|
|
bio_callback_test bio_memleak_test param_build_test \
|
2020-05-14 22:45:38 +08:00
|
|
|
bioprinttest sslapitest dtlstest sslcorrupttest \
|
2020-01-15 22:48:57 +08:00
|
|
|
bio_enc_test pkey_meth_test pkey_meth_kdf_test evp_kdf_test uitest \
|
2018-06-22 05:16:18 +08:00
|
|
|
cipherbytes_test \
|
2018-09-08 16:09:32 +08:00
|
|
|
asn1_encode_test asn1_decode_test asn1_string_table_test \
|
2017-06-28 00:04:37 +08:00
|
|
|
x509_time_test x509_dup_cert_test x509_check_cert_pkey_test \
|
2020-08-26 12:11:49 +08:00
|
|
|
recordlentest drbgtest rand_status_test sslbuffertest \
|
2017-06-28 15:46:13 +08:00
|
|
|
time_offset_test pemtest ssl_cert_table_internal_test ciphername_test \
|
2020-03-25 20:46:02 +08:00
|
|
|
http_test servername_test ocspapitest fatalerrtest tls13ccstest \
|
2018-01-21 20:19:05 +08:00
|
|
|
sysdefaulttest errtest ssl_ctx_test gosttest \
|
2019-10-17 06:26:44 +08:00
|
|
|
context_internal_test aesgcmtest params_test evp_pkey_dparams_test \
|
2020-08-05 21:46:48 +08:00
|
|
|
keymgmt_internal_test hexstr_test provider_status_test defltfips_test
|
2016-04-14 20:44:15 +08:00
|
|
|
|
2020-02-13 09:00:57 +08:00
|
|
|
IF[{- !$disabled{'deprecated-3.0'} -}]
|
|
|
|
PROGRAMS{noinst}=enginetest
|
|
|
|
ENDIF
|
|
|
|
|
2019-08-19 12:35:54 +08:00
|
|
|
SOURCE[confdump]=confdump.c
|
|
|
|
INCLUDE[confdump]=../include ../apps/include
|
|
|
|
DEPEND[confdump]=../libcrypto
|
|
|
|
|
2018-03-26 17:00:05 +08:00
|
|
|
SOURCE[versions]=versions.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[versions]=../include ../apps/include
|
2018-03-26 17:00:05 +08:00
|
|
|
DEPEND[versions]=../libcrypto
|
|
|
|
|
2016-04-14 20:44:15 +08:00
|
|
|
SOURCE[aborttest]=aborttest.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[aborttest]=../include ../apps/include
|
2016-04-14 20:44:15 +08:00
|
|
|
DEPEND[aborttest]=../libcrypto
|
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[sanitytest]=sanitytest.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[sanitytest]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[sanitytest]=../libcrypto libtestutil.a
|
2016-04-14 20:44:15 +08:00
|
|
|
|
2018-09-17 06:09:25 +08:00
|
|
|
SOURCE[rsa_complex]=rsa_complex.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[rsa_complex]=../include ../apps/include
|
2018-09-17 06:09:25 +08:00
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[test_test]=test_test.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[test_test]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[test_test]=../libcrypto libtestutil.a
|
2017-03-22 12:27:55 +08:00
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[exdatatest]=exdatatest.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[exdatatest]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[exdatatest]=../libcrypto libtestutil.a
|
2017-02-28 23:53:28 +08:00
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[bntest]=bntest.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[bntest]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[bntest]=../libcrypto libtestutil.a
|
2016-04-14 20:44:15 +08:00
|
|
|
|
|
|
|
SOURCE[ectest]=ectest.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[ectest]=../include ../apps/include
|
2017-04-28 12:06:11 +08:00
|
|
|
DEPEND[ectest]=../libcrypto libtestutil.a
|
2016-04-14 20:44:15 +08:00
|
|
|
|
2017-06-17 04:55:19 +08:00
|
|
|
SOURCE[ecstresstest]=ecstresstest.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[ecstresstest]=../include ../apps/include
|
2017-06-17 04:55:19 +08:00
|
|
|
DEPEND[ecstresstest]=../libcrypto libtestutil.a
|
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[gmdifftest]=gmdifftest.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[gmdifftest]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[gmdifftest]=../libcrypto libtestutil.a
|
2016-04-14 20:44:15 +08:00
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[pbelutest]=pbelutest.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[pbelutest]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[pbelutest]=../libcrypto libtestutil.a
|
2016-04-14 20:44:15 +08:00
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[mdc2test]=mdc2test.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[mdc2test]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[mdc2test]=../libcrypto libtestutil.a
|
2016-04-14 20:44:15 +08:00
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[enginetest]=enginetest.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[enginetest]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[enginetest]=../libcrypto libtestutil.a
|
2016-01-30 06:33:10 +08:00
|
|
|
|
2016-04-14 20:44:15 +08:00
|
|
|
SOURCE[exptest]=exptest.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[exptest]=../include ../apps/include
|
2017-04-26 21:11:50 +08:00
|
|
|
DEPEND[exptest]=../libcrypto libtestutil.a
|
2016-01-30 06:33:10 +08:00
|
|
|
|
2017-11-29 21:56:15 +08:00
|
|
|
SOURCE[fatalerrtest]=fatalerrtest.c ssltestlib.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[fatalerrtest]=../include ../apps/include
|
2017-11-29 21:56:15 +08:00
|
|
|
DEPEND[fatalerrtest]=../libcrypto ../libssl libtestutil.a
|
2017-11-30 18:13:13 +08:00
|
|
|
|
|
|
|
SOURCE[tls13ccstest]=tls13ccstest.c ssltestlib.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[tls13ccstest]=../include ../apps/include
|
2017-11-30 18:13:13 +08:00
|
|
|
DEPEND[tls13ccstest]=../libcrypto ../libssl libtestutil.a
|
2017-11-29 21:56:15 +08:00
|
|
|
|
2016-04-14 20:44:15 +08:00
|
|
|
SOURCE[evp_test]=evp_test.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[evp_test]=../include ../apps/include
|
2017-04-27 03:33:43 +08:00
|
|
|
DEPEND[evp_test]=../libcrypto libtestutil.a
|
2019-04-11 18:27:59 +08:00
|
|
|
IF[{- $disabled{legacy} || !$target{dso_scheme} -}]
|
|
|
|
DEFINE[evp_test]=NO_LEGACY_MODULE
|
|
|
|
ENDIF
|
2016-01-30 06:33:10 +08:00
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[evp_extra_test]=evp_extra_test.c
|
2020-02-20 01:00:26 +08:00
|
|
|
INCLUDE[evp_extra_test]=../include ../apps/include
|
2020-09-11 14:36:54 +08:00
|
|
|
DEPEND[evp_extra_test]=../libcrypto.a libtestutil.a
|
2019-09-15 17:55:10 +08:00
|
|
|
|
2020-06-16 00:48:39 +08:00
|
|
|
SOURCE[evp_extra_test2]=evp_extra_test2.c
|
|
|
|
INCLUDE[evp_extra_test2]=../include ../apps/include
|
|
|
|
DEPEND[evp_extra_test2]=../libcrypto libtestutil.a
|
|
|
|
|
2020-07-09 11:43:10 +08:00
|
|
|
SOURCE[evp_libctx_test]=evp_libctx_test.c
|
|
|
|
INCLUDE[evp_libctx_test]=../include ../apps/include
|
|
|
|
DEPEND[evp_libctx_test]=../libcrypto.a libtestutil.a
|
|
|
|
|
2019-09-15 17:55:10 +08:00
|
|
|
SOURCE[evp_fetch_prov_test]=evp_fetch_prov_test.c
|
2020-02-20 01:00:26 +08:00
|
|
|
INCLUDE[evp_fetch_prov_test]=../include ../apps/include
|
2019-09-15 17:55:10 +08:00
|
|
|
DEPEND[evp_fetch_prov_test]=../libcrypto libtestutil.a
|
2019-03-21 19:57:35 +08:00
|
|
|
IF[{- $disabled{fips} || !$target{dso_scheme} -}]
|
|
|
|
DEFINE[evp_extra_test]=NO_FIPS_MODULE
|
|
|
|
ENDIF
|
2016-01-30 06:33:10 +08:00
|
|
|
|
2019-11-18 09:30:50 +08:00
|
|
|
SOURCE[evp_pkey_provided_test]=evp_pkey_provided_test.c
|
|
|
|
INCLUDE[evp_pkey_provided_test]=../include ../apps/include
|
2020-02-16 17:54:08 +08:00
|
|
|
DEPEND[evp_pkey_provided_test]=../libcrypto.a libtestutil.a
|
2019-10-18 05:53:44 +08:00
|
|
|
|
2020-06-17 09:33:16 +08:00
|
|
|
IF[{- !$disabled{acvp-tests} -}]
|
|
|
|
SOURCE[acvp_test]=acvp_test.c
|
|
|
|
INCLUDE[acvp_test]=../include ../apps/include
|
|
|
|
DEPEND[acvp_test]=../libcrypto.a libtestutil.a
|
|
|
|
ENDIF
|
|
|
|
|
2020-09-10 14:40:24 +08:00
|
|
|
SOURCE[ossl_store_test]=ossl_store_test.c
|
|
|
|
INCLUDE[ossl_store_test]=../include ../apps/include
|
|
|
|
DEPEND[ossl_store_test]=../libcrypto.a libtestutil.a
|
|
|
|
|
2020-08-09 16:06:52 +08:00
|
|
|
SOURCE[provider_status_test]=provider_status_test.c
|
|
|
|
INCLUDE[provider_status_test]=../include ../apps/include
|
|
|
|
DEPEND[provider_status_test]=../libcrypto.a libtestutil.a
|
|
|
|
|
2020-02-06 18:31:41 +08:00
|
|
|
IF[{- !$disabled{'deprecated-3.0'} -}]
|
2020-01-03 00:15:26 +08:00
|
|
|
PROGRAMS{noinst}=igetest bftest casttest
|
|
|
|
|
2019-12-06 01:09:49 +08:00
|
|
|
SOURCE[igetest]=igetest.c
|
|
|
|
INCLUDE[igetest]=../include ../apps/include
|
|
|
|
DEPEND[igetest]=../libcrypto libtestutil.a
|
2020-01-02 22:25:27 +08:00
|
|
|
|
|
|
|
SOURCE[bftest]=bftest.c
|
|
|
|
INCLUDE[bftest]=../include ../apps/include
|
|
|
|
DEPEND[bftest]=../libcrypto libtestutil.a
|
2020-01-03 00:15:26 +08:00
|
|
|
|
|
|
|
SOURCE[casttest]=casttest.c
|
|
|
|
INCLUDE[casttest]=../include ../apps/include
|
|
|
|
DEPEND[casttest]=../libcrypto libtestutil.a
|
2019-12-06 01:09:49 +08:00
|
|
|
ENDIF
|
2016-01-30 06:33:10 +08:00
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[v3nametest]=v3nametest.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[v3nametest]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[v3nametest]=../libcrypto libtestutil.a
|
2016-01-30 06:33:10 +08:00
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[crltest]=crltest.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[crltest]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[crltest]=../libcrypto libtestutil.a
|
2016-11-29 04:33:40 +08:00
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[v3ext]=v3ext.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[v3ext]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[v3ext]=../libcrypto libtestutil.a
|
2016-06-08 23:37:06 +08:00
|
|
|
|
2016-04-14 20:44:15 +08:00
|
|
|
SOURCE[danetest]=danetest.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[danetest]=../include ../apps/include
|
2017-05-02 20:32:26 +08:00
|
|
|
DEPEND[danetest]=../libcrypto ../libssl libtestutil.a
|
2016-01-30 06:33:10 +08:00
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[constant_time_test]=constant_time_test.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[constant_time_test]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[constant_time_test]=../libcrypto libtestutil.a
|
2016-01-30 06:33:10 +08:00
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[verify_extra_test]=verify_extra_test.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[verify_extra_test]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[verify_extra_test]=../libcrypto libtestutil.a
|
2016-01-30 06:33:10 +08:00
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[clienthellotest]=clienthellotest.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[clienthellotest]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[clienthellotest]=../libcrypto ../libssl libtestutil.a
|
2016-01-30 06:33:10 +08:00
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[bad_dtls_test]=bad_dtls_test.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[bad_dtls_test]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[bad_dtls_test]=../libcrypto ../libssl libtestutil.a
|
2016-07-25 21:31:43 +08:00
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[packettest]=packettest.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[packettest]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[packettest]=../libcrypto libtestutil.a
|
2016-01-30 06:33:10 +08:00
|
|
|
|
2016-04-14 20:44:15 +08:00
|
|
|
SOURCE[asynctest]=asynctest.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[asynctest]=../include ../apps/include
|
2016-04-14 20:44:15 +08:00
|
|
|
DEPEND[asynctest]=../libcrypto
|
2016-01-30 06:33:10 +08:00
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[secmemtest]=secmemtest.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[secmemtest]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[secmemtest]=../libcrypto libtestutil.a
|
2016-01-30 06:33:10 +08:00
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[srptest]=srptest.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[srptest]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[srptest]=../libcrypto libtestutil.a
|
2016-01-30 06:33:10 +08:00
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[memleaktest]=memleaktest.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[memleaktest]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[memleaktest]=../libcrypto libtestutil.a
|
2016-02-06 12:45:32 +08:00
|
|
|
|
2019-09-19 13:39:13 +08:00
|
|
|
SOURCE[pkcs12_format_test]=pkcs12_format_test.c pkcs12_helper.c
|
|
|
|
INCLUDE[pkcs12_format_test]=../include ../apps/include
|
|
|
|
DEPEND[pkcs12_format_test]=../libcrypto libtestutil.a
|
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[stack_test]=stack_test.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[stack_test]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[stack_test]=../libcrypto libtestutil.a
|
2017-03-14 10:37:26 +08:00
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[lhash_test]=lhash_test.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[lhash_test]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[lhash_test]=../libcrypto libtestutil.a
|
2017-03-16 13:00:23 +08:00
|
|
|
|
2016-04-14 20:44:15 +08:00
|
|
|
SOURCE[dtlsv1listentest]=dtlsv1listentest.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[dtlsv1listentest]=../include ../apps/include
|
2017-04-27 00:20:44 +08:00
|
|
|
DEPEND[dtlsv1listentest]=../libssl libtestutil.a
|
2016-02-26 05:48:36 +08:00
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[ct_test]=ct_test.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[ct_test]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[ct_test]=../libcrypto libtestutil.a
|
2015-10-26 00:43:55 +08:00
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[threadstest]=threadstest.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[threadstest]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[threadstest]=../libcrypto libtestutil.a
|
2016-02-28 03:34:47 +08:00
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[afalgtest]=afalgtest.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[afalgtest]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[afalgtest]=../libcrypto libtestutil.a
|
2016-03-03 13:56:10 +08:00
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[d2i_test]=d2i_test.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[d2i_test]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[d2i_test]=../libcrypto libtestutil.a
|
2016-03-31 04:37:05 +08:00
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[ssl_test_ctx_test]=ssl_test_ctx_test.c ssl_test_ctx.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[ssl_test_ctx_test]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[ssl_test_ctx_test]=../libcrypto ../libssl libtestutil.a
|
2016-03-17 22:14:30 +08:00
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[ssl_test]=ssl_test.c ssl_test_ctx.c handshake_helper.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[ssl_test]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[ssl_test]=../libcrypto ../libssl libtestutil.a
|
2016-03-17 22:14:30 +08:00
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[cipherlist_test]=cipherlist_test.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[cipherlist_test]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[cipherlist_test]=../libcrypto ../libssl libtestutil.a
|
2016-04-06 22:03:06 +08:00
|
|
|
|
2016-06-30 04:59:50 +08:00
|
|
|
INCLUDE[ssl_test_ctx.o]=../include
|
Add TLSv1.3 post-handshake authentication (PHA)
Add SSL_verify_client_post_handshake() for servers to initiate PHA
Add SSL_force_post_handshake_auth() for clients that don't have certificates
initially configured, but use a certificate callback.
Update SSL_CTX_set_verify()/SSL_set_verify() mode:
* Add SSL_VERIFY_POST_HANDSHAKE to postpone client authentication until after
the initial handshake.
* Update SSL_VERIFY_CLIENT_ONCE now only sends out one CertRequest regardless
of when the certificate authentication takes place; either initial handshake,
re-negotiation, or post-handshake authentication.
Add 'RequestPostHandshake' and 'RequirePostHandshake' SSL_CONF options that
add the SSL_VERIFY_POST_HANDSHAKE to the 'Request' and 'Require' options
Add support to s_client:
* Enabled automatically when cert is configured
* Can be forced enabled via -force_pha
Add support to s_server:
* Use 'c' to invoke PHA in s_server
* Remove some dead code
Update documentation
Update unit tests:
* Illegal use of PHA extension
* TLSv1.3 certificate tests
DTLS and TLS behave ever-so-slightly differently. So, when DTLS1.3 is
implemented, it's PHA support state machine may need to be different.
Add a TODO and a #error
Update handshake context to deal with PHA.
The handshake context for TLSv1.3 post-handshake auth is up through the
ClientFinish message, plus the CertificateRequest message. Subsequent
Certificate, CertificateVerify, and Finish messages are based on this
handshake context (not the Certificate message per se, but it's included
after the hash). KeyUpdate, NewSessionTicket, and prior Certificate
Request messages are not included in post-handshake authentication.
After the ClientFinished message is processed, save off the digest state
for future post-handshake authentication. When post-handshake auth occurs,
copy over the saved handshake context into the "main" handshake digest.
This effectively discards the any KeyUpdate or NewSessionTicket messages
and any prior post-handshake authentication.
This, of course, assumes that the ID-22 did not mean to include any
previous post-handshake authentication into the new handshake transcript.
This is implied by section 4.4.1 that lists messages only up to the
first ClientFinished.
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4964)
2017-12-19 05:52:28 +08:00
|
|
|
INCLUDE[handshake_helper.o]=.. ../include
|
2019-09-19 13:39:13 +08:00
|
|
|
INCLUDE[pkcs12_helper.o]=.. ../include
|
2017-03-28 04:49:29 +08:00
|
|
|
INCLUDE[ssltestlib.o]=.. ../include
|
2019-08-10 20:07:22 +08:00
|
|
|
INCLUDE[cmp_testlib.o]=.. ../include ../apps/include
|
2016-05-03 02:46:51 +08:00
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[x509aux]=x509aux.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[x509aux]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[x509aux]=../libcrypto libtestutil.a
|
2016-05-12 23:04:10 +08:00
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[asynciotest]=asynciotest.c ssltestlib.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[asynciotest]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[asynciotest]=../libcrypto ../libssl libtestutil.a
|
2016-05-26 20:47:47 +08:00
|
|
|
|
2018-03-19 21:20:53 +08:00
|
|
|
SOURCE[bio_callback_test]=bio_callback_test.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[bio_callback_test]=../include ../apps/include
|
2018-03-19 21:20:53 +08:00
|
|
|
DEPEND[bio_callback_test]=../libcrypto libtestutil.a
|
|
|
|
|
2019-01-21 15:47:02 +08:00
|
|
|
SOURCE[bio_memleak_test]=bio_memleak_test.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[bio_memleak_test]=../include ../apps/include
|
2019-01-21 15:47:02 +08:00
|
|
|
DEPEND[bio_memleak_test]=../libcrypto libtestutil.a
|
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[bioprinttest]=bioprinttest.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[bioprinttest]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[bioprinttest]=../libcrypto libtestutil.a
|
2016-08-05 06:32:36 +08:00
|
|
|
|
2019-02-22 10:21:33 +08:00
|
|
|
SOURCE[params_api_test]=params_api_test.c
|
|
|
|
INCLUDE[params_api_test]=../include ../apps/include
|
|
|
|
DEPEND[params_api_test]=../libcrypto libtestutil.a
|
|
|
|
|
2019-05-21 05:42:26 +08:00
|
|
|
SOURCE[params_conversion_test]=params_conversion_test.c
|
|
|
|
INCLUDE[params_conversion_test]=../include ../apps/include
|
|
|
|
DEPEND[params_conversion_test]=../libcrypto libtestutil.a
|
|
|
|
|
2019-07-17 14:59:09 +08:00
|
|
|
SOURCE[param_build_test]=param_build_test.c
|
|
|
|
INCLUDE[param_build_test]=../include ../apps/include
|
|
|
|
DEPEND[param_build_test]=../libcrypto.a libtestutil.a
|
|
|
|
|
2020-05-22 00:59:47 +08:00
|
|
|
SOURCE[sslapitest]=sslapitest.c ssltestlib.c filterprov.c tls-provider.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[sslapitest]=../include ../apps/include ..
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[sslapitest]=../libcrypto ../libssl libtestutil.a
|
2017-10-20 03:44:10 +08:00
|
|
|
|
2020-08-05 21:46:48 +08:00
|
|
|
SOURCE[defltfips_test]=defltfips_test.c
|
|
|
|
INCLUDE[defltfips_test]=../include ../apps/include
|
|
|
|
DEPEND[defltfips_test]=../libcrypto libtestutil.a
|
|
|
|
|
2017-10-20 03:44:10 +08:00
|
|
|
SOURCE[ocspapitest]=ocspapitest.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[ocspapitest]=../include ../apps/include
|
2017-10-20 03:44:10 +08:00
|
|
|
DEPEND[ocspapitest]=../libcrypto libtestutil.a
|
2016-07-04 21:59:06 +08:00
|
|
|
|
2019-10-31 06:39:35 +08:00
|
|
|
IF[{- !$disabled{sock} -}]
|
|
|
|
PROGRAMS{noinst}=http_test
|
|
|
|
ENDIF
|
|
|
|
|
|
|
|
SOURCE[http_test]=http_test.c
|
|
|
|
INCLUDE[http_test]=../include ../apps/include
|
|
|
|
DEPEND[http_test]=../libcrypto libtestutil.a
|
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[dtlstest]=dtlstest.c ssltestlib.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[dtlstest]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[dtlstest]=../libcrypto ../libssl libtestutil.a
|
2016-08-22 05:31:21 +08:00
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[sslcorrupttest]=sslcorrupttest.c ssltestlib.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[sslcorrupttest]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[sslcorrupttest]=../libcrypto ../libssl libtestutil.a
|
2016-11-01 04:50:26 +08:00
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[bio_enc_test]=bio_enc_test.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[bio_enc_test]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[bio_enc_test]=../libcrypto libtestutil.a
|
2016-09-08 17:01:24 +08:00
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[pkey_meth_test]=pkey_meth_test.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[pkey_meth_test]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[pkey_meth_test]=../libcrypto libtestutil.a
|
2016-11-20 05:52:34 +08:00
|
|
|
|
2017-08-04 03:44:18 +08:00
|
|
|
SOURCE[pkey_meth_kdf_test]=pkey_meth_kdf_test.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[pkey_meth_kdf_test]=../include ../apps/include
|
2017-08-04 03:44:18 +08:00
|
|
|
DEPEND[pkey_meth_kdf_test]=../libcrypto libtestutil.a
|
|
|
|
|
2018-06-22 05:16:18 +08:00
|
|
|
SOURCE[evp_kdf_test]=evp_kdf_test.c
|
2019-02-14 01:59:13 +08:00
|
|
|
INCLUDE[evp_kdf_test]=../include ../apps/include
|
2018-06-22 05:16:18 +08:00
|
|
|
DEPEND[evp_kdf_test]=../libcrypto libtestutil.a
|
|
|
|
|
2019-05-27 19:52:37 +08:00
|
|
|
SOURCE[evp_pkey_dparams_test]=evp_pkey_dparams_test.c
|
|
|
|
INCLUDE[evp_pkey_dparams_test]=../include ../apps/include
|
|
|
|
DEPEND[evp_pkey_dparams_test]=../libcrypto libtestutil.a
|
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[x509_time_test]=x509_time_test.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[x509_time_test]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[x509_time_test]=../libcrypto libtestutil.a
|
2017-02-18 02:00:15 +08:00
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[recordlentest]=recordlentest.c ssltestlib.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[recordlentest]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[recordlentest]=../libcrypto ../libssl libtestutil.a
|
2017-03-07 00:56:42 +08:00
|
|
|
|
2017-06-28 00:04:37 +08:00
|
|
|
SOURCE[drbgtest]=drbgtest.c
|
2020-02-20 01:00:26 +08:00
|
|
|
INCLUDE[drbgtest]=../include ../apps/include
|
2018-10-23 00:05:14 +08:00
|
|
|
DEPEND[drbgtest]=../libcrypto.a libtestutil.a
|
2017-06-28 00:04:37 +08:00
|
|
|
|
2020-08-26 12:11:49 +08:00
|
|
|
SOURCE[rand_status_test]=rand_status_test.c
|
|
|
|
INCLUDE[rand_status_test]=../include ../apps/include
|
|
|
|
DEPEND[rand_status_test]=../libcrypto libtestutil.a
|
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[x509_dup_cert_test]=x509_dup_cert_test.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[x509_dup_cert_test]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[x509_dup_cert_test]=../libcrypto libtestutil.a
|
2017-04-21 03:33:42 +08:00
|
|
|
|
2017-06-05 03:16:40 +08:00
|
|
|
SOURCE[x509_check_cert_pkey_test]=x509_check_cert_pkey_test.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[x509_check_cert_pkey_test]=../include ../apps/include
|
2017-06-05 03:16:40 +08:00
|
|
|
DEPEND[x509_check_cert_pkey_test]=../libcrypto libtestutil.a
|
|
|
|
|
2017-04-13 05:24:43 +08:00
|
|
|
SOURCE[pemtest]=pemtest.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[pemtest]=../include ../apps/include
|
2017-04-13 05:24:43 +08:00
|
|
|
DEPEND[pemtest]=../libcrypto libtestutil.a
|
|
|
|
|
2017-07-09 02:28:15 +08:00
|
|
|
SOURCE[ssl_cert_table_internal_test]=ssl_cert_table_internal_test.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[ssl_cert_table_internal_test]=.. ../include ../apps/include
|
2017-07-09 02:28:15 +08:00
|
|
|
DEPEND[ssl_cert_table_internal_test]=../libcrypto libtestutil.a
|
|
|
|
|
2017-06-30 03:06:19 +08:00
|
|
|
SOURCE[ciphername_test]=ciphername_test.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[ciphername_test]=../include ../apps/include
|
2017-06-30 03:06:19 +08:00
|
|
|
DEPEND[ciphername_test]=../libcrypto ../libssl libtestutil.a
|
|
|
|
|
2020-03-25 20:46:02 +08:00
|
|
|
SOURCE[http_test]=http_test.c
|
|
|
|
INCLUDE[http_test]=../include ../apps/include
|
|
|
|
DEPEND[http_test]=../libcrypto libtestutil.a
|
|
|
|
|
2018-09-07 22:17:34 +08:00
|
|
|
SOURCE[servername_test]=servername_test.c ssltestlib.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[servername_test]=../include ../apps/include
|
2017-06-28 15:46:13 +08:00
|
|
|
DEPEND[servername_test]=../libcrypto ../libssl libtestutil.a
|
|
|
|
|
2018-05-09 19:05:39 +08:00
|
|
|
IF[{- !$disabled{cms} -}]
|
2018-11-07 18:02:06 +08:00
|
|
|
PROGRAMS{noinst}=cmsapitest
|
2018-05-09 19:05:39 +08:00
|
|
|
SOURCE[cmsapitest]=cmsapitest.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[cmsapitest]=../include ../apps/include
|
2018-05-09 19:05:39 +08:00
|
|
|
DEPEND[cmsapitest]=../libcrypto libtestutil.a
|
|
|
|
ENDIF
|
2018-05-01 16:32:30 +08:00
|
|
|
|
2016-10-12 23:13:31 +08:00
|
|
|
IF[{- !$disabled{psk} -}]
|
2018-11-07 18:02:06 +08:00
|
|
|
PROGRAMS{noinst}=dtls_mtu_test
|
2016-10-12 23:13:31 +08:00
|
|
|
SOURCE[dtls_mtu_test]=dtls_mtu_test.c ssltestlib.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[dtls_mtu_test]=.. ../include ../apps/include
|
2017-04-27 00:20:44 +08:00
|
|
|
DEPEND[dtls_mtu_test]=../libcrypto ../libssl libtestutil.a
|
2016-10-12 23:13:31 +08:00
|
|
|
ENDIF
|
|
|
|
|
2016-11-03 18:31:12 +08:00
|
|
|
IF[{- !$disabled{shared} -}]
|
2018-11-07 18:02:06 +08:00
|
|
|
PROGRAMS{noinst}=shlibloadtest
|
2016-10-18 21:16:35 +08:00
|
|
|
SOURCE[shlibloadtest]=shlibloadtest.c
|
2020-02-20 01:00:26 +08:00
|
|
|
INCLUDE[shlibloadtest]=../include ../apps/include
|
2016-10-18 21:16:35 +08:00
|
|
|
ENDIF
|
|
|
|
|
2019-11-25 23:30:51 +08:00
|
|
|
# cipher_overhead_test uses internal symbols, so it must be linked with
|
|
|
|
# the static libraries
|
|
|
|
PROGRAMS{noinst}=cipher_overhead_test
|
|
|
|
SOURCE[cipher_overhead_test]=cipher_overhead_test.c
|
|
|
|
INCLUDE[cipher_overhead_test]=.. ../include ../apps/include
|
|
|
|
DEPEND[cipher_overhead_test]=../libcrypto.a ../libssl.a libtestutil.a
|
2016-10-26 06:25:44 +08:00
|
|
|
|
2019-08-29 04:27:47 +08:00
|
|
|
SOURCE[uitest]=uitest.c ../apps/lib/apps_ui.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[uitest]=.. ../include ../apps/include
|
2018-08-16 10:36:01 +08:00
|
|
|
DEPEND[uitest]=../libcrypto ../libssl libtestutil.a
|
2017-01-11 07:13:59 +08:00
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[cipherbytes_test]=cipherbytes_test.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[cipherbytes_test]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[cipherbytes_test]=../libcrypto ../libssl libtestutil.a
|
2017-01-31 02:59:59 +08:00
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[asn1_encode_test]=asn1_encode_test.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[asn1_encode_test]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[asn1_encode_test]=../libcrypto libtestutil.a
|
2017-04-01 03:28:20 +08:00
|
|
|
|
2018-09-08 16:09:32 +08:00
|
|
|
SOURCE[asn1_decode_test]=asn1_decode_test.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[asn1_decode_test]=../include ../apps/include
|
2018-09-08 16:09:32 +08:00
|
|
|
DEPEND[asn1_decode_test]=../libcrypto libtestutil.a
|
|
|
|
|
2017-07-27 01:18:50 +08:00
|
|
|
SOURCE[asn1_string_table_test]=asn1_string_table_test.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[asn1_string_table_test]=../include ../apps/include
|
2017-07-27 01:18:50 +08:00
|
|
|
DEPEND[asn1_string_table_test]=../libcrypto libtestutil.a
|
|
|
|
|
2017-02-17 05:08:02 +08:00
|
|
|
SOURCE[time_offset_test]=time_offset_test.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[time_offset_test]=../include ../apps/include
|
2017-02-17 05:08:02 +08:00
|
|
|
DEPEND[time_offset_test]=../libcrypto libtestutil.a
|
|
|
|
|
2018-02-27 20:55:35 +08:00
|
|
|
SOURCE[conf_include_test]=conf_include_test.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[conf_include_test]=../include ../apps/include
|
2018-02-27 20:55:35 +08:00
|
|
|
DEPEND[conf_include_test]=../libcrypto libtestutil.a
|
|
|
|
|
2019-08-10 20:07:22 +08:00
|
|
|
IF[{- !$disabled{cmp} -}]
|
2019-11-05 16:56:59 +08:00
|
|
|
PROGRAMS{noinst}=cmp_asn_test cmp_ctx_test cmp_status_test cmp_hdr_test \
|
2020-03-10 17:29:46 +08:00
|
|
|
cmp_protect_test cmp_msg_test cmp_vfy_test \
|
2020-03-11 00:32:57 +08:00
|
|
|
cmp_server_test cmp_client_test
|
2019-08-10 20:07:22 +08:00
|
|
|
ENDIF
|
|
|
|
|
|
|
|
SOURCE[cmp_asn_test]=cmp_asn_test.c 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
|
|
|
|
INCLUDE[cmp_ctx_test]=.. ../include ../apps/include
|
|
|
|
DEPEND[cmp_ctx_test]=../libcrypto.a libtestutil.a
|
|
|
|
|
2019-09-27 16:22:23 +08:00
|
|
|
SOURCE[cmp_hdr_test]=cmp_hdr_test.c 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
|
|
|
|
INCLUDE[cmp_status_test]=.. ../include ../apps/include
|
|
|
|
DEPEND[cmp_status_test]=../libcrypto.a libtestutil.a
|
|
|
|
|
2019-12-17 12:47:50 +08:00
|
|
|
SOURCE[cmp_protect_test]=cmp_protect_test.c cmp_testlib.c
|
2019-11-05 16:56:59 +08:00
|
|
|
INCLUDE[cmp_protect_test]=.. ../include ../apps/include
|
|
|
|
DEPEND[cmp_protect_test]=../libcrypto.a libtestutil.a
|
|
|
|
|
2019-12-17 12:47:50 +08:00
|
|
|
SOURCE[cmp_msg_test]=cmp_msg_test.c cmp_testlib.c
|
2019-11-05 16:56:59 +08:00
|
|
|
INCLUDE[cmp_msg_test]=.. ../include ../apps/include
|
|
|
|
DEPEND[cmp_msg_test]=../libcrypto.a libtestutil.a
|
|
|
|
|
2020-03-10 17:29:46 +08:00
|
|
|
SOURCE[cmp_vfy_test]=cmp_vfy_test.c cmp_testlib.c
|
2020-02-15 21:57:32 +08:00
|
|
|
INCLUDE[cmp_vfy_test]=.. ../include ../apps/include
|
|
|
|
DEPEND[cmp_vfy_test]=../libcrypto.a libtestutil.a
|
|
|
|
|
2020-03-10 17:29:46 +08:00
|
|
|
SOURCE[cmp_server_test]=cmp_server_test.c cmp_testlib.c
|
|
|
|
INCLUDE[cmp_server_test]=.. ../include ../apps/include
|
|
|
|
DEPEND[cmp_server_test]=../libcrypto.a libtestutil.a
|
|
|
|
|
2020-03-11 00:32:57 +08:00
|
|
|
SOURCE[cmp_client_test]=cmp_client_test.c cmp_testlib.c ../apps/cmp_mock_srv.c
|
|
|
|
INCLUDE[cmp_client_test]=.. ../include ../apps/include
|
|
|
|
DEPEND[cmp_client_test]=../libcrypto.a libtestutil.a
|
|
|
|
|
2016-10-27 14:44:36 +08:00
|
|
|
# Internal test programs. These are essentially a collection of internal
|
2016-11-10 03:09:03 +08:00
|
|
|
# test routines. Some of them need to reach internal symbols that aren't
|
|
|
|
# available through the shared library (at least on Linux, Solaris, Windows
|
|
|
|
# and VMS, where the exported symbols are those listed in util/*.num), these
|
2017-03-29 05:57:28 +08:00
|
|
|
# programs are forcibly linked with the static libraries, where all symbols
|
2018-10-25 21:55:15 +08:00
|
|
|
# are always available.
|
|
|
|
IF[1]
|
2018-11-07 18:02:06 +08:00
|
|
|
PROGRAMS{noinst}=asn1_internal_test modes_internal_test x509_internal_test \
|
Fix issues in ia32 RDRAND asm leading to reduced entropy
This patch fixes two issues in the ia32 RDRAND assembly code that result in a
(possibly significant) loss of entropy.
The first, less significant, issue is that, by returning success as 0 from
OPENSSL_ia32_rdrand() and OPENSSL_ia32_rdseed(), a subtle bias was introduced.
Specifically, because the assembly routine copied the remaining number of
retries over the result when RDRAND/RDSEED returned 'successful but zero', a
bias towards values 1-8 (primarily 8) was introduced.
The second, more worrying issue was that, due to a mixup in registers, when a
buffer that was not size 0 or 1 mod 8 was passed to OPENSSL_ia32_rdrand_bytes
or OPENSSL_ia32_rdseed_bytes, the last (n mod 8) bytes were all the same value.
This issue impacts only the 64-bit variant of the assembly.
This change fixes both issues by first eliminating the only use of
OPENSSL_ia32_rdrand, replacing it with OPENSSL_ia32_rdrand_bytes, and fixes the
register mixup in OPENSSL_ia32_rdrand_bytes. It also adds a sanity test for
OPENSSL_ia32_rdrand_bytes and OPENSSL_ia32_rdseed_bytes to help catch problems
of this nature in the future.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5342)
2018-03-08 05:01:06 +08:00
|
|
|
tls13encryptiontest wpackettest ctype_internal_test \
|
2020-02-12 13:03:51 +08:00
|
|
|
rdrand_sanitytest property_test ideatest rsa_mp_test \
|
|
|
|
rsa_sp800_56b_test bn_internal_test ecdsatest rsa_test \
|
2020-02-16 11:03:46 +08:00
|
|
|
rc2test rc4test rc5test hmactest ffc_internal_test \
|
2020-02-03 17:05:31 +08:00
|
|
|
asn1_dsa_internal_test dsatest dsa_no_digest_size_test \
|
|
|
|
dhtest ssltest_old
|
2018-07-05 07:28:51 +08:00
|
|
|
|
2016-11-10 03:09:03 +08:00
|
|
|
IF[{- !$disabled{poly1305} -}]
|
2018-11-07 18:02:06 +08:00
|
|
|
PROGRAMS{noinst}=poly1305_internal_test
|
2016-11-10 03:09:03 +08:00
|
|
|
ENDIF
|
2017-03-05 06:11:16 +08:00
|
|
|
IF[{- !$disabled{chacha} -}]
|
2018-11-07 18:02:06 +08:00
|
|
|
PROGRAMS{noinst}=chacha_internal_test
|
2017-03-05 06:11:16 +08:00
|
|
|
ENDIF
|
2017-01-12 05:38:44 +08:00
|
|
|
IF[{- !$disabled{siphash} -}]
|
2018-11-07 18:02:06 +08:00
|
|
|
PROGRAMS{noinst}=siphash_internal_test
|
2017-01-12 05:38:44 +08:00
|
|
|
ENDIF
|
2018-04-06 21:45:41 +08:00
|
|
|
IF[{- !$disabled{sm2} -}]
|
2018-11-07 18:02:06 +08:00
|
|
|
PROGRAMS{noinst}=sm2_internal_test
|
2018-04-06 21:45:41 +08:00
|
|
|
ENDIF
|
2017-10-31 13:19:14 +08:00
|
|
|
IF[{- !$disabled{sm4} -}]
|
2018-11-07 18:02:06 +08:00
|
|
|
PROGRAMS{noinst}=sm4_internal_test
|
2017-10-31 13:19:14 +08:00
|
|
|
ENDIF
|
2018-02-20 22:53:40 +08:00
|
|
|
IF[{- !$disabled{ec} -}]
|
2019-02-12 22:00:20 +08:00
|
|
|
PROGRAMS{noinst}=ec_internal_test curve448_internal_test
|
2018-02-20 22:53:40 +08:00
|
|
|
ENDIF
|
2020-05-27 18:40:24 +08:00
|
|
|
IF[{- !$disabled{cmac} -}]
|
|
|
|
PROGRAMS{noinst}=cmactest
|
|
|
|
ENDIF
|
2016-11-10 03:09:03 +08:00
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[poly1305_internal_test]=poly1305_internal_test.c
|
2020-02-20 01:00:26 +08:00
|
|
|
INCLUDE[poly1305_internal_test]=.. ../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[poly1305_internal_test]=../libcrypto.a libtestutil.a
|
2016-11-10 03:09:03 +08:00
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[chacha_internal_test]=chacha_internal_test.c
|
2020-02-20 01:00:26 +08:00
|
|
|
INCLUDE[chacha_internal_test]=.. ../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[chacha_internal_test]=../libcrypto.a libtestutil.a
|
2017-03-05 06:11:16 +08:00
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[asn1_internal_test]=asn1_internal_test.c
|
2020-02-20 01:00:26 +08:00
|
|
|
INCLUDE[asn1_internal_test]=.. ../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[asn1_internal_test]=../libcrypto.a libtestutil.a
|
2016-11-10 03:09:03 +08:00
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[modes_internal_test]=modes_internal_test.c
|
2020-02-20 01:00:26 +08:00
|
|
|
INCLUDE[modes_internal_test]=.. ../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[modes_internal_test]=../libcrypto.a libtestutil.a
|
2016-11-10 03:09:03 +08:00
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[x509_internal_test]=x509_internal_test.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[x509_internal_test]=.. ../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[x509_internal_test]=../libcrypto.a libtestutil.a
|
2016-11-18 06:58:46 +08:00
|
|
|
|
2020-02-12 13:03:51 +08:00
|
|
|
SOURCE[rsa_test]=rsa_test.c
|
|
|
|
INCLUDE[rsa_test]=../include ../apps/include
|
|
|
|
DEPEND[rsa_test]=../libcrypto.a libtestutil.a
|
|
|
|
|
|
|
|
SOURCE[rsa_mp_test]=rsa_mp_test.c
|
|
|
|
INCLUDE[rsa_mp_test]=../include ../apps/include
|
|
|
|
DEPEND[rsa_mp_test]=../libcrypto.a libtestutil.a
|
2020-01-30 05:23:39 +08:00
|
|
|
|
2020-01-28 13:14:18 +08:00
|
|
|
SOURCE[ecdsatest]=ecdsatest.c
|
|
|
|
INCLUDE[ecdsatest]=../include ../apps/include
|
|
|
|
DEPEND[ecdsatest]=../libcrypto.a libtestutil.a
|
|
|
|
|
2020-01-30 05:23:39 +08:00
|
|
|
SOURCE[dsatest]=dsatest.c
|
|
|
|
INCLUDE[dsatest]=../include ../apps/include
|
|
|
|
DEPEND[dsatest]=../libcrypto.a libtestutil.a
|
|
|
|
|
|
|
|
SOURCE[dsa_no_digest_size_test]=dsa_no_digest_size_test.c
|
|
|
|
INCLUDE[dsa_no_digest_size_test]=../include ../apps/include
|
|
|
|
DEPEND[dsa_no_digest_size_test]=../libcrypto.a libtestutil.a
|
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[tls13encryptiontest]=tls13encryptiontest.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[tls13encryptiontest]=.. ../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[tls13encryptiontest]=../libcrypto ../libssl.a libtestutil.a
|
2017-01-23 22:53:44 +08:00
|
|
|
|
2020-01-13 11:02:45 +08:00
|
|
|
SOURCE[ideatest]=ideatest.c
|
|
|
|
INCLUDE[ideatest]=../include ../apps/include
|
|
|
|
DEPEND[ideatest]=../libcrypto.a libtestutil.a
|
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[wpackettest]=wpackettest.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[wpackettest]=../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[wpackettest]=../libcrypto ../libssl.a libtestutil.a
|
2017-01-12 05:38:44 +08:00
|
|
|
|
2018-11-16 09:44:30 +08:00
|
|
|
SOURCE[property_test]=property_test.c
|
2019-05-01 18:02:43 +08:00
|
|
|
INCLUDE[property_test]=.. ../include ../apps/include
|
2018-11-16 09:44:30 +08:00
|
|
|
DEPEND[property_test]=../libcrypto.a libtestutil.a
|
|
|
|
|
2017-08-21 05:19:17 +08:00
|
|
|
SOURCE[ctype_internal_test]=ctype_internal_test.c
|
2019-09-28 06:45:33 +08:00
|
|
|
INCLUDE[ctype_internal_test]=.. ../include ../apps/include
|
2017-08-21 05:19:17 +08:00
|
|
|
DEPEND[ctype_internal_test]=../libcrypto.a libtestutil.a
|
|
|
|
|
2019-01-24 10:15:54 +08:00
|
|
|
SOURCE[sparse_array_test]=sparse_array_test.c
|
2020-02-20 01:00:26 +08:00
|
|
|
INCLUDE[sparse_array_test]=../include ../apps/include
|
2019-01-24 10:15:54 +08:00
|
|
|
DEPEND[sparse_array_test]=../libcrypto.a libtestutil.a
|
|
|
|
|
2020-02-03 17:05:31 +08:00
|
|
|
SOURCE[dhtest]=dhtest.c
|
|
|
|
INCLUDE[dhtest]=../include ../apps/include
|
|
|
|
DEPEND[dhtest]=../libcrypto.a libtestutil.a
|
|
|
|
|
2020-01-14 10:11:50 +08:00
|
|
|
SOURCE[hmactest]=hmactest.c
|
|
|
|
INCLUDE[hmactest]=../include ../apps/include
|
|
|
|
DEPEND[hmactest]=../libcrypto.a libtestutil.a
|
|
|
|
|
2020-05-27 18:40:24 +08:00
|
|
|
IF[{- !$disabled{cmac} -}]
|
|
|
|
SOURCE[cmactest]=cmactest.c
|
|
|
|
INCLUDE[cmactest]=../include ../apps/include
|
|
|
|
DEPEND[cmactest]=../libcrypto.a libtestutil.a
|
|
|
|
ENDIF
|
|
|
|
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[siphash_internal_test]=siphash_internal_test.c
|
2020-02-20 01:00:26 +08:00
|
|
|
INCLUDE[siphash_internal_test]=.. ../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[siphash_internal_test]=../libcrypto.a libtestutil.a
|
2017-10-31 13:19:14 +08:00
|
|
|
|
2018-05-31 20:49:47 +08:00
|
|
|
SOURCE[sm2_internal_test]=sm2_internal_test.c
|
2020-02-20 01:00:26 +08:00
|
|
|
INCLUDE[sm2_internal_test]=../include ../apps/include
|
2018-05-31 20:49:47 +08:00
|
|
|
DEPEND[sm2_internal_test]=../libcrypto.a libtestutil.a
|
2018-04-06 21:45:41 +08:00
|
|
|
|
2017-10-31 13:19:14 +08:00
|
|
|
SOURCE[sm4_internal_test]=sm4_internal_test.c
|
2020-02-20 01:00:26 +08:00
|
|
|
INCLUDE[sm4_internal_test]=.. ../include ../apps/include
|
2017-10-31 13:19:14 +08:00
|
|
|
DEPEND[sm4_internal_test]=../libcrypto.a libtestutil.a
|
2019-02-12 22:00:20 +08:00
|
|
|
|
2020-01-16 11:50:03 +08:00
|
|
|
SOURCE[destest]=destest.c
|
|
|
|
INCLUDE[destest]=../include ../apps/include
|
|
|
|
DEPEND[destest]=../libcrypto.a libtestutil.a
|
|
|
|
|
2020-01-14 07:15:18 +08:00
|
|
|
SOURCE[rc2test]=rc2test.c
|
|
|
|
INCLUDE[rc2test]=../include ../apps/include
|
|
|
|
DEPEND[rc2test]=../libcrypto.a libtestutil.a
|
|
|
|
|
2020-01-14 07:38:09 +08:00
|
|
|
SOURCE[rc4test]=rc4test.c
|
|
|
|
INCLUDE[rc4test]=../include ../apps/include
|
|
|
|
DEPEND[rc4test]=../libcrypto.a libtestutil.a
|
|
|
|
|
2020-01-14 08:33:03 +08:00
|
|
|
SOURCE[rc5test]=rc5test.c
|
|
|
|
INCLUDE[rc5test]=../include ../apps/include
|
|
|
|
DEPEND[rc5test]=../libcrypto.a libtestutil.a
|
|
|
|
|
2019-02-12 22:00:20 +08:00
|
|
|
SOURCE[ec_internal_test]=ec_internal_test.c
|
2020-02-20 01:00:26 +08:00
|
|
|
INCLUDE[ec_internal_test]=../include ../crypto/ec ../apps/include
|
2019-02-12 22:00:20 +08:00
|
|
|
DEPEND[ec_internal_test]=../libcrypto.a libtestutil.a
|
2017-12-13 03:55:38 +08:00
|
|
|
|
|
|
|
SOURCE[curve448_internal_test]=curve448_internal_test.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[curve448_internal_test]=.. ../include ../apps/include ../crypto/ec/curve448
|
2017-12-13 03:55:38 +08:00
|
|
|
DEPEND[curve448_internal_test]=../libcrypto.a libtestutil.a
|
Fix issues in ia32 RDRAND asm leading to reduced entropy
This patch fixes two issues in the ia32 RDRAND assembly code that result in a
(possibly significant) loss of entropy.
The first, less significant, issue is that, by returning success as 0 from
OPENSSL_ia32_rdrand() and OPENSSL_ia32_rdseed(), a subtle bias was introduced.
Specifically, because the assembly routine copied the remaining number of
retries over the result when RDRAND/RDSEED returned 'successful but zero', a
bias towards values 1-8 (primarily 8) was introduced.
The second, more worrying issue was that, due to a mixup in registers, when a
buffer that was not size 0 or 1 mod 8 was passed to OPENSSL_ia32_rdrand_bytes
or OPENSSL_ia32_rdseed_bytes, the last (n mod 8) bytes were all the same value.
This issue impacts only the 64-bit variant of the assembly.
This change fixes both issues by first eliminating the only use of
OPENSSL_ia32_rdrand, replacing it with OPENSSL_ia32_rdrand_bytes, and fixes the
register mixup in OPENSSL_ia32_rdrand_bytes. It also adds a sanity test for
OPENSSL_ia32_rdrand_bytes and OPENSSL_ia32_rdseed_bytes to help catch problems
of this nature in the future.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5342)
2018-03-08 05:01:06 +08:00
|
|
|
|
2020-01-09 11:14:13 +08:00
|
|
|
SOURCE[rc4test]=rc4test.c
|
|
|
|
INCLUDE[rc4test]=../include ../apps/include
|
|
|
|
DEPEND[rc4test]=../libcrypto.a libtestutil.a
|
|
|
|
|
Fix issues in ia32 RDRAND asm leading to reduced entropy
This patch fixes two issues in the ia32 RDRAND assembly code that result in a
(possibly significant) loss of entropy.
The first, less significant, issue is that, by returning success as 0 from
OPENSSL_ia32_rdrand() and OPENSSL_ia32_rdseed(), a subtle bias was introduced.
Specifically, because the assembly routine copied the remaining number of
retries over the result when RDRAND/RDSEED returned 'successful but zero', a
bias towards values 1-8 (primarily 8) was introduced.
The second, more worrying issue was that, due to a mixup in registers, when a
buffer that was not size 0 or 1 mod 8 was passed to OPENSSL_ia32_rdrand_bytes
or OPENSSL_ia32_rdseed_bytes, the last (n mod 8) bytes were all the same value.
This issue impacts only the 64-bit variant of the assembly.
This change fixes both issues by first eliminating the only use of
OPENSSL_ia32_rdrand, replacing it with OPENSSL_ia32_rdrand_bytes, and fixes the
register mixup in OPENSSL_ia32_rdrand_bytes. It also adds a sanity test for
OPENSSL_ia32_rdrand_bytes and OPENSSL_ia32_rdseed_bytes to help catch problems
of this nature in the future.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5342)
2018-03-08 05:01:06 +08:00
|
|
|
SOURCE[rdrand_sanitytest]=rdrand_sanitytest.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[rdrand_sanitytest]=../include ../apps/include
|
Fix issues in ia32 RDRAND asm leading to reduced entropy
This patch fixes two issues in the ia32 RDRAND assembly code that result in a
(possibly significant) loss of entropy.
The first, less significant, issue is that, by returning success as 0 from
OPENSSL_ia32_rdrand() and OPENSSL_ia32_rdseed(), a subtle bias was introduced.
Specifically, because the assembly routine copied the remaining number of
retries over the result when RDRAND/RDSEED returned 'successful but zero', a
bias towards values 1-8 (primarily 8) was introduced.
The second, more worrying issue was that, due to a mixup in registers, when a
buffer that was not size 0 or 1 mod 8 was passed to OPENSSL_ia32_rdrand_bytes
or OPENSSL_ia32_rdseed_bytes, the last (n mod 8) bytes were all the same value.
This issue impacts only the 64-bit variant of the assembly.
This change fixes both issues by first eliminating the only use of
OPENSSL_ia32_rdrand, replacing it with OPENSSL_ia32_rdrand_bytes, and fixes the
register mixup in OPENSSL_ia32_rdrand_bytes. It also adds a sanity test for
OPENSSL_ia32_rdrand_bytes and OPENSSL_ia32_rdseed_bytes to help catch problems
of this nature in the future.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5342)
2018-03-08 05:01:06 +08:00
|
|
|
DEPEND[rdrand_sanitytest]=../libcrypto.a libtestutil.a
|
2018-07-05 07:28:51 +08:00
|
|
|
|
|
|
|
SOURCE[rsa_sp800_56b_test]=rsa_sp800_56b_test.c
|
2019-09-28 06:45:33 +08:00
|
|
|
INCLUDE[rsa_sp800_56b_test]=.. ../include ../crypto/rsa ../apps/include
|
2018-07-05 07:28:51 +08:00
|
|
|
DEPEND[rsa_sp800_56b_test]=../libcrypto.a libtestutil.a
|
|
|
|
|
|
|
|
SOURCE[bn_internal_test]=bn_internal_test.c
|
2019-09-28 06:45:33 +08:00
|
|
|
INCLUDE[bn_internal_test]=.. ../include ../crypto/bn ../apps/include
|
2018-07-05 07:28:51 +08:00
|
|
|
DEPEND[bn_internal_test]=../libcrypto.a libtestutil.a
|
2019-06-03 12:58:54 +08:00
|
|
|
|
|
|
|
SOURCE[asn1_dsa_internal_test]=asn1_dsa_internal_test.c
|
2020-02-20 01:00:26 +08:00
|
|
|
INCLUDE[asn1_dsa_internal_test]=.. ../include ../apps/include
|
2019-06-03 12:58:54 +08:00
|
|
|
DEPEND[asn1_dsa_internal_test]=../libcrypto.a libtestutil.a
|
2019-10-17 06:26:44 +08:00
|
|
|
|
|
|
|
SOURCE[keymgmt_internal_test]=keymgmt_internal_test.c
|
|
|
|
INCLUDE[keymgmt_internal_test]=.. ../include ../apps/include
|
|
|
|
DEPEND[keymgmt_internal_test]=../libcrypto.a libtestutil.a
|
2016-10-27 05:12:48 +08:00
|
|
|
|
2020-02-16 11:03:46 +08:00
|
|
|
SOURCE[ffc_internal_test]=ffc_internal_test.c
|
2020-09-08 19:07:46 +08:00
|
|
|
INCLUDE[ffc_internal_test]=.. ../include ../apps/include
|
2020-02-16 11:03:46 +08:00
|
|
|
DEPEND[ffc_internal_test]=../libcrypto.a libtestutil.a
|
|
|
|
|
2020-01-09 09:18:58 +08:00
|
|
|
IF[{- !$disabled{mdc2} -}]
|
|
|
|
PROGRAMS{noinst}=mdc2_internal_test
|
|
|
|
ENDIF
|
2016-10-28 04:18:50 +08:00
|
|
|
|
2020-01-09 09:18:58 +08:00
|
|
|
SOURCE[mdc2_internal_test]=mdc2_internal_test.c
|
|
|
|
INCLUDE[mdc2_internal_test]=.. ../include ../apps/include
|
|
|
|
DEPEND[mdc2_internal_test]=../libcrypto.a libtestutil.a
|
2020-02-03 17:05:31 +08:00
|
|
|
|
|
|
|
SOURCE[ssltest_old]=ssltest_old.c
|
|
|
|
INCLUDE[ssltest_old]=.. ../include ../apps/include
|
|
|
|
DEPEND[ssltest_old]=../libcrypto.a ../libssl.a
|
2020-01-09 09:18:58 +08:00
|
|
|
ENDIF
|
2016-11-07 18:18:41 +08:00
|
|
|
|
2018-11-07 18:02:06 +08:00
|
|
|
PROGRAMS{noinst}=asn1_time_test
|
2017-08-04 09:24:03 +08:00
|
|
|
SOURCE[asn1_time_test]=asn1_time_test.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[asn1_time_test]=../include ../apps/include
|
2017-08-04 09:24:03 +08:00
|
|
|
DEPEND[asn1_time_test]=../libcrypto libtestutil.a
|
|
|
|
|
2016-11-07 18:18:41 +08:00
|
|
|
# We disable this test completely in a shared build because it deliberately
|
|
|
|
# redefines some internal libssl symbols. This doesn't work in a non-shared
|
|
|
|
# build
|
|
|
|
IF[{- !$disabled{shared} -}]
|
2018-11-07 18:02:06 +08:00
|
|
|
PROGRAMS{noinst}=tls13secretstest
|
2017-04-18 22:47:11 +08:00
|
|
|
SOURCE[tls13secretstest]=tls13secretstest.c
|
2020-01-26 02:49:41 +08:00
|
|
|
DEFINE[tls13secretstest]=OPENSSL_NO_KTLS
|
2019-06-07 23:32:49 +08:00
|
|
|
SOURCE[tls13secretstest]= ../ssl/tls13_enc.c ../crypto/packet.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[tls13secretstest]=.. ../include ../apps/include
|
2017-04-18 22:47:11 +08:00
|
|
|
DEPEND[tls13secretstest]=../libcrypto ../libssl libtestutil.a
|
2016-11-07 18:18:41 +08:00
|
|
|
ENDIF
|
2017-01-14 00:00:26 +08:00
|
|
|
|
|
|
|
SOURCE[sslbuffertest]=sslbuffertest.c ssltestlib.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[sslbuffertest]=../include ../apps/include
|
2017-01-14 00:00:26 +08:00
|
|
|
DEPEND[sslbuffertest]=../libcrypto ../libssl libtestutil.a
|
2018-03-19 22:01:39 +08:00
|
|
|
|
|
|
|
SOURCE[sysdefaulttest]=sysdefaulttest.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[sysdefaulttest]=../include ../apps/include
|
2018-03-19 22:01:39 +08:00
|
|
|
DEPEND[sysdefaulttest]=../libcrypto ../libssl libtestutil.a
|
2018-05-21 05:24:30 +08:00
|
|
|
|
|
|
|
SOURCE[errtest]=errtest.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[errtest]=../include ../apps/include
|
2018-05-21 05:24:30 +08:00
|
|
|
DEPEND[errtest]=../libcrypto libtestutil.a
|
2018-07-13 23:11:46 +08:00
|
|
|
|
|
|
|
SOURCE[gosttest]=gosttest.c ssltestlib.c
|
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
2019-02-12 18:37:43 +08:00
|
|
|
INCLUDE[gosttest]=../include ../apps/include ..
|
2018-07-13 23:11:46 +08:00
|
|
|
DEPEND[gosttest]=../libcrypto ../libssl libtestutil.a
|
2019-02-07 00:42:50 +08:00
|
|
|
|
2019-02-21 06:27:25 +08:00
|
|
|
SOURCE[aesgcmtest]=aesgcmtest.c
|
|
|
|
INCLUDE[aesgcmtest]=../include ../apps/include ..
|
|
|
|
DEPEND[aesgcmtest]=../libcrypto libtestutil.a
|
|
|
|
|
2019-02-07 00:42:50 +08:00
|
|
|
PROGRAMS{noinst}=context_internal_test
|
|
|
|
SOURCE[context_internal_test]=context_internal_test.c
|
|
|
|
INCLUDE[context_internal_test]=.. ../include ../apps/include
|
|
|
|
DEPEND[context_internal_test]=../libcrypto.a libtestutil.a
|
2019-02-21 05:55:43 +08:00
|
|
|
|
|
|
|
PROGRAMS{noinst}=provider_internal_test
|
|
|
|
DEFINE[provider_internal_test]=PROVIDER_INIT_FUNCTION_NAME=p_test_init
|
|
|
|
SOURCE[provider_internal_test]=provider_internal_test.c p_test.c
|
|
|
|
INCLUDE[provider_internal_test]=../include ../apps/include
|
|
|
|
DEPEND[provider_internal_test]=../libcrypto.a libtestutil.a
|
|
|
|
PROGRAMS{noinst}=provider_test
|
|
|
|
DEFINE[provider_test]=PROVIDER_INIT_FUNCTION_NAME=p_test_init
|
|
|
|
SOURCE[provider_test]=provider_test.c p_test.c
|
|
|
|
INCLUDE[provider_test]=../include ../apps/include
|
|
|
|
DEPEND[provider_test]=../libcrypto.a libtestutil.a
|
2019-03-31 21:17:58 +08:00
|
|
|
IF[{- !$disabled{module} -}]
|
2019-02-21 05:55:43 +08:00
|
|
|
MODULES{noinst}=p_test
|
|
|
|
SOURCE[p_test]=p_test.c
|
|
|
|
INCLUDE[p_test]=../include
|
|
|
|
IF[{- defined $target{shared_defflag} -}]
|
|
|
|
SOURCE[p_test]=p_test.ld
|
|
|
|
GENERATE[p_test.ld]=../util/providers.num
|
|
|
|
ENDIF
|
2019-03-31 21:26:26 +08:00
|
|
|
ENDIF
|
|
|
|
IF[{- $disabled{module} || !$target{dso_scheme} -}]
|
2019-04-04 18:35:47 +08:00
|
|
|
DEFINE[provider_test]=NO_PROVIDER_MODULE
|
|
|
|
DEFINE[provider_internal_test]=NO_PROVIDER_MODULE
|
2019-02-21 05:55:43 +08:00
|
|
|
ENDIF
|
2020-02-26 02:25:13 +08:00
|
|
|
DEPEND[]=provider_internal_test.cnf
|
|
|
|
GENERATE[provider_internal_test.cnf]=provider_internal_test.cnf.in
|
2019-03-05 00:22:45 +08:00
|
|
|
|
2020-05-23 22:34:07 +08:00
|
|
|
PROGRAMS{noinst}=provider_fallback_test
|
|
|
|
SOURCE[provider_fallback_test]=provider_fallback_test.c
|
|
|
|
INCLUDE[provider_fallback_test]=../include ../apps/include
|
|
|
|
DEPEND[provider_fallback_test]=../libcrypto libtestutil.a
|
|
|
|
|
2019-03-05 00:22:45 +08:00
|
|
|
PROGRAMS{noinst}=params_test
|
|
|
|
SOURCE[params_test]=params_test.c
|
|
|
|
INCLUDE[params_test]=.. ../include ../apps/include
|
|
|
|
DEPEND[params_test]=../libcrypto.a libtestutil.a
|
2019-05-23 22:00:05 +08:00
|
|
|
|
2020-05-26 10:44:36 +08:00
|
|
|
PROGRAMS{noinst}=hexstr_test
|
|
|
|
SOURCE[hexstr_test]=hexstr_test.c
|
|
|
|
INCLUDE[hexstr_test]=.. ../include ../apps/include
|
|
|
|
DEPEND[hexstr_test]=../libcrypto.a libtestutil.a
|
|
|
|
|
2020-08-17 03:25:08 +08:00
|
|
|
PROGRAMS{noinst}=endecode_test
|
|
|
|
SOURCE[endecode_test]=endecode_test.c
|
|
|
|
INCLUDE[endecode_test]=.. ../include ../apps/include
|
|
|
|
DEPEND[endecode_test]=../libcrypto.a libtestutil.a
|
2020-07-10 01:10:39 +08:00
|
|
|
|
2019-05-23 22:00:05 +08:00
|
|
|
PROGRAMS{noinst}=namemap_internal_test
|
|
|
|
SOURCE[namemap_internal_test]=namemap_internal_test.c
|
|
|
|
INCLUDE[namemap_internal_test]=.. ../include ../apps/include
|
|
|
|
DEPEND[namemap_internal_test]=../libcrypto.a libtestutil.a
|
2019-12-12 21:51:59 +08:00
|
|
|
|
|
|
|
PROGRAMS{noinst}=bio_prefix_text
|
|
|
|
SOURCE[bio_prefix_text]=bio_prefix_text.c $LIBAPPSSRC
|
|
|
|
INCLUDE[bio_prefix_text]=.. ../include ../apps/include
|
|
|
|
DEPEND[bio_prefix_text]=../libcrypto
|
2016-08-05 06:32:36 +08:00
|
|
|
ENDIF
|
|
|
|
|
2018-01-21 20:19:05 +08:00
|
|
|
SOURCE[ssl_ctx_test]=ssl_ctx_test.c
|
2019-11-02 18:18:31 +08:00
|
|
|
INCLUDE[ssl_ctx_test]=../include ../apps/include
|
2018-01-21 20:19:05 +08:00
|
|
|
DEPEND[ssl_ctx_test]=../libcrypto ../libssl libtestutil.a
|
|
|
|
|
2016-08-05 06:32:36 +08:00
|
|
|
{-
|
2016-06-30 04:59:50 +08:00
|
|
|
use File::Spec::Functions;
|
2016-06-03 21:02:10 +08:00
|
|
|
use File::Basename;
|
2017-08-02 04:43:56 +08:00
|
|
|
use OpenSSL::Glob;
|
2016-06-03 21:02:10 +08:00
|
|
|
|
|
|
|
my @nogo_headers = ( "asn1_mac.h",
|
2018-05-02 05:25:16 +08:00
|
|
|
"opensslconf.h",
|
2016-06-03 21:02:10 +08:00
|
|
|
"__decc_include_prologue.h",
|
|
|
|
"__decc_include_epilogue.h" );
|
2018-03-20 01:54:27 +08:00
|
|
|
my @nogo_headers_re = ( qr/.*err\.h/ );
|
2016-06-03 21:02:10 +08:00
|
|
|
my @headerfiles = glob catfile($sourcedir,
|
|
|
|
updir(), "include", "openssl", "*.h");
|
|
|
|
|
|
|
|
foreach my $headerfile (@headerfiles) {
|
|
|
|
my $name = basename($headerfile, ".h");
|
|
|
|
next if $disabled{$name};
|
|
|
|
next if grep { $_ eq lc("$name.h") } @nogo_headers;
|
2018-03-20 01:54:27 +08:00
|
|
|
next if grep { lc("$name.h") =~ m/$_/i } @nogo_headers_re;
|
2016-06-03 21:02:10 +08:00
|
|
|
$OUT .= <<"_____";
|
|
|
|
|
2019-02-25 18:43:00 +08:00
|
|
|
PROGRAMS{noinst}=buildtest_c_$name
|
|
|
|
SOURCE[buildtest_c_$name]=buildtest_$name.c
|
2016-06-03 21:02:10 +08:00
|
|
|
GENERATE[buildtest_$name.c]=generate_buildtest.pl $name
|
2019-02-25 18:43:00 +08:00
|
|
|
INCLUDE[buildtest_c_$name]=../include
|
|
|
|
DEPEND[buildtest_c_$name]=../libssl ../libcrypto
|
|
|
|
_____
|
2019-02-28 20:28:43 +08:00
|
|
|
$OUT .= <<"_____" if $config{CXX} && !$disabled{"buildtest-c++"};
|
2019-02-25 18:43:00 +08:00
|
|
|
|
|
|
|
PROGRAMS{noinst}=buildtest_cc_$name
|
|
|
|
SOURCE[buildtest_cc_$name]=buildtest_$name.cc
|
|
|
|
GENERATE[buildtest_$name.cc]=generate_buildtest.pl $name
|
|
|
|
INCLUDE[buildtest_cc_$name]=../include
|
|
|
|
DEPEND[buildtest_cc_$name]=../libssl ../libcrypto
|
2016-06-03 21:02:10 +08:00
|
|
|
_____
|
|
|
|
}
|
2016-08-05 06:32:36 +08:00
|
|
|
-}
|