openssl/test
Matt Caswell f865b08143 Split configuration of TLSv1.3 ciphers from older ciphers
With the current mechanism, old cipher strings that used to work in 1.1.0,
may inadvertently disable all TLSv1.3 ciphersuites causing connections to
fail. This is confusing for users.

In reality TLSv1.3 are quite different to older ciphers. They are much
simpler and there are only a small number of them so, arguably, they don't
need the same level of control that the older ciphers have.

This change splits the configuration of TLSv1.3 ciphers from older ones.
By default the TLSv1.3 ciphers are on, so you cannot inadvertently disable
them through your existing config.

Fixes #5359

Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5392)
2018-03-14 10:15:50 +00:00
..
certs Update tests for TLS Ed448 2018-03-05 11:39:44 +00:00
ct
d2i-tests
ocsp-tests
ossl_shim Don't negotiate TLSv1.3 with the ossl_shim 2018-03-12 15:08:15 +00:00
recipes Split configuration of TLSv1.3 ciphers from older ciphers 2018-03-14 10:15:50 +00:00
smime-certs
ssl-tests Split configuration of TLSv1.3 ciphers from older ciphers 2018-03-14 10:15:50 +00:00
testutil Update copyright year 2018-02-27 13:59:42 +00:00
aborttest.c
afalgtest.c Revert "Modify test/afalgtest to fail if the afalg engine couldn't be loaded" 2018-02-07 22:18:44 +01:00
asn1_encode_test.c Update copyright year 2018-02-27 13:59:42 +00:00
asn1_internal_test.c Fix AppVeyor/VC build failure 2017-11-16 14:02:27 +01:00
asn1_string_table_test.c
asn1_time_test.c Update copyright year 2018-02-13 13:59:25 +00:00
asynciotest.c Update ServerHello to new draft-22 format 2017-12-14 15:06:37 +00:00
asynctest.c
bad_dtls_test.c Remove unicode characters from source 2017-12-08 11:56:37 +01:00
bftest.c Consistent formatting for sizeof(foo) 2017-12-07 19:11:49 -05:00
bio_enc_test.c Fix no-chacha and no-poly1305 2017-08-25 11:34:08 +01:00
bioprinttest.c
bntest.c Update copyright year 2018-02-13 13:59:25 +00:00
bntests.pl
build.info Fix issues in ia32 RDRAND asm leading to reduced entropy 2018-03-08 10:27:49 -05:00
CAss.cnf
CAssdh.cnf
CAssdsa.cnf
CAssrsa.cnf
casttest.c Use "" not <> for internal/ includes 2017-08-22 09:54:20 -04:00
CAtsa.cnf
chacha_internal_test.c
cipher_overhead_test.c Use "" not <> for internal/ includes 2017-08-22 09:54:20 -04:00
cipherbytes_test.c Use "" not <> for internal/ includes 2017-08-22 09:54:20 -04:00
cipherlist_test.c Split configuration of TLSv1.3 ciphers from older ciphers 2018-03-14 10:15:50 +00:00
ciphername_test.c Use "" not <> for internal/ includes 2017-08-22 09:54:20 -04:00
clienthellotest.c Split configuration of TLSv1.3 ciphers from older ciphers 2018-03-14 10:15:50 +00:00
cms-examples.pl
conf_include_test.c Add support for .include directive in config files 2018-03-05 13:32:40 +00:00
constant_time_test.c Update copyright year 2018-02-27 13:59:42 +00:00
crltest.c Factorise duplicated code. 2017-11-13 07:52:35 -05:00
ct_test.c test/ct_test.c: remove dependency on -lm. 2018-02-26 17:48:06 +01:00
ctype_internal_test.c test/ctype_internal_test.c: portability fixup. 2018-03-03 22:15:15 +01:00
curve448_internal_test.c Update copyright year 2018-02-27 13:59:42 +00:00
d2i_test.c Consistent formatting for sizeof(foo) 2017-12-07 19:11:49 -05:00
danetest.c Use "" not <> for internal/ includes 2017-08-22 09:54:20 -04:00
danetest.in
danetest.pem
destest.c
dhtest.c Allow DH_set0_key with only private key. 2017-09-26 14:48:51 +02:00
drbgtest.c DRBG: make the derivation function the default for ctr_drbg 2018-02-13 17:32:54 +01:00
drbgtest.h
dsatest.c Use "" not <> for internal/ includes 2017-08-22 09:54:20 -04:00
dtls_mtu_test.c
dtlstest.c add callback handler for setting DTLS timer interval 2017-09-06 08:30:00 +02:00
dtlsv1listentest.c Use "" not <> for internal/ includes 2017-08-22 09:54:20 -04:00
ecdsatest.c Update tests for TLS Ed448 2018-03-05 11:39:44 +00:00
ecstresstest.c Use "" not <> for internal/ includes 2017-08-22 09:54:20 -04:00
ectest.c Update tests for TLS Ed448 2018-03-05 11:39:44 +00:00
enginetest.c Add EVP_PKEY_METHOD redirection test 2017-10-12 00:03:32 +01:00
evp_extra_test.c Fix no-ec 2017-12-08 08:29:17 -06:00
evp_test.c Don't assume shared key length matches expected length 2017-10-12 02:40:30 +01:00
evp_test.h
exdatatest.c
exptest.c Use "" not <> for internal/ includes 2017-08-22 09:54:20 -04:00
fatalerrtest.c Split configuration of TLSv1.3 ciphers from older ciphers 2018-03-14 10:15:50 +00:00
generate_buildtest.pl
generate_ssl_tests.pl
gmdifftest.c
handshake_helper.c Session Ticket app data 2018-03-12 10:31:09 +00:00
handshake_helper.h Session Ticket app data 2018-03-12 10:31:09 +00:00
hmactest.c Use "" not <> for internal/ includes 2017-08-22 09:54:20 -04:00
ideatest.c Use "" not <> for internal/ includes 2017-08-22 09:54:20 -04:00
igetest.c Consistent formatting for sizeof(foo) 2017-12-07 19:11:49 -05:00
lhash_test.c Use "" not <> for internal/ includes 2017-08-22 09:54:20 -04:00
md2test.c Use "" not <> for internal/ includes 2017-08-22 09:54:20 -04:00
mdc2_internal_test.c Use "" not <> for internal/ includes 2017-08-22 09:54:20 -04:00
mdc2test.c Use "" not <> for internal/ includes 2017-08-22 09:54:20 -04:00
memleaktest.c
modes_internal_test.c Update copyright year 2018-02-13 13:59:25 +00:00
ocspapitest.c Wrap more of ocspapitest.c in OPENSSL_NO_OCSP 2017-12-08 09:16:36 -06:00
P1ss.cnf
P2ss.cnf
packettest.c Fix a bunch of gcc warnings in packettest.c 2018-03-06 19:07:46 +01:00
pbelutest.c
pemtest.c
pkcs7-1.pem
pkcs7.pem
pkey_meth_kdf_test.c
pkey_meth_test.c
pkits-test.pl Many spelling fixes/typo's corrected. 2017-11-11 19:03:10 -05:00
poly1305_internal_test.c Update copyright year 2018-02-13 13:59:25 +00:00
rc2test.c Use "" not <> for internal/ includes 2017-08-22 09:54:20 -04:00
rc4test.c Use "" not <> for internal/ includes 2017-08-22 09:54:20 -04:00
rc5test.c Use "" not <> for internal/ includes 2017-08-22 09:54:20 -04:00
rdrand_sanitytest.c Fix issues in ia32 RDRAND asm leading to reduced entropy 2018-03-08 10:27:49 -05:00
README Fix test documentation. 2017-09-08 13:58:59 -05:00
README.external Many spelling fixes/typo's corrected. 2017-11-11 19:03:10 -05:00
README.ssltest.md Session resume broken switching contexts 2017-10-04 10:21:08 +10:00
recordlentest.c Use the TLSv1.3 record header as AAD 2018-03-14 09:51:20 +00:00
rsa_mp_test.c rsa/rsa_gen.c: harmonize keygen's ability with RSA_security_bits. 2017-11-28 20:05:48 +01:00
rsa_test.c Use "" not <> for internal/ includes 2017-08-22 09:54:20 -04:00
run_tests.pl test/run_tests.pl: don't use Module::Load::Conditional. 2017-09-02 20:20:51 +02:00
sanitytest.c Consistent formatting for sizeof(foo) 2017-12-07 19:11:49 -05:00
secmemtest.c
serverinfo2.pem
serverinfo.pem
servername_test.c Use "" not <> for internal/ includes 2017-08-22 09:54:20 -04:00
session.pem
shibboleth.pfx
shlibloadtest.c Remove OPENSSL_USE_NODELETE guards in shlibloadtest 2018-03-07 16:20:35 +00:00
siphash_internal_test.c Update copyright year 2018-02-13 13:59:25 +00:00
sm4_internal_test.c SM4: Add SM4 block cipher to EVP 2017-10-31 15:19:14 +10:00
smcont.txt
srptest.c
ssl_cert_table_internal_test.c Update tests for TLS Ed448 2018-03-05 11:39:44 +00:00
ssl_test_ctx_test.c Session Ticket app data 2018-03-12 10:31:09 +00:00
ssl_test_ctx_test.conf Implement Maximum Fragment Length TLS extension. 2017-11-05 17:46:48 +01:00
ssl_test_ctx.c Session Ticket app data 2018-03-12 10:31:09 +00:00
ssl_test_ctx.h Session Ticket app data 2018-03-12 10:31:09 +00:00
ssl_test.c Session Ticket app data 2018-03-12 10:31:09 +00:00
ssl_test.tmpl
sslapitest.c Split configuration of TLSv1.3 ciphers from older ciphers 2018-03-14 10:15:50 +00:00
sslbuffertest.c
sslcorrupttest.c Split configuration of TLSv1.3 ciphers from older ciphers 2018-03-14 10:15:50 +00:00
ssltest_old.c Split configuration of TLSv1.3 ciphers from older ciphers 2018-03-14 10:15:50 +00:00
ssltestlib.c Use "" not <> for internal/ includes 2017-08-22 09:54:20 -04:00
ssltestlib.h
Sssdsa.cnf
Sssrsa.cnf
stack_test.c Add a reserve call to the stack data structure. 2017-09-28 06:53:40 +10:00
test_test.c Test support for time_t comparisons. 2017-11-28 08:56:45 +10:00
test.cnf
testcrl.pem
testdsa.pem
testdsapub.pem
testec-p256.pem
testecpub-p256.pem
testp7.pem
testreq2.pem
testrsa.pem
testrsapub.pem
testsid.pem
testutil.h Test support for time_t comparisons. 2017-11-28 08:56:45 +10:00
testx509.pem
threadstest.c
time_offset_test.c Use "" not <> for internal/ includes 2017-08-22 09:54:20 -04:00
tls13ccstest.c Do not set a nonzero default max_early_data 2018-02-28 21:47:09 -06:00
tls13encryptiontest.c Use the TLSv1.3 record header as AAD 2018-03-14 09:51:20 +00:00
tls13secretstest.c Export keying material using early exporter master secret 2018-02-26 13:35:54 +00:00
uitest.c
Uss.cnf
v3-cert1.pem
v3-cert2.pem
v3ext.c
v3nametest.c Update copyright year 2018-02-13 13:59:25 +00:00
verify_extra_test.c
wpackettest.c
x509_check_cert_pkey_test.c
x509_dup_cert_test.c
x509_internal_test.c Iron out /WX errors in VC-WIN32. 2017-11-17 21:22:26 +01:00
x509_time_test.c Use "" not <> for internal/ includes 2017-08-22 09:54:20 -04:00
x509aux.c Use "" not <> for internal/ includes 2017-08-22 09:54:20 -04:00

How to add recipes
==================

For any test that you want to perform, you write a script located in
test/recipes/, named {nn}-test_{name}.t, where {nn} is a two digit number and
{name} is a unique name of your choice.

Please note that if a test involves a new testing executable, you will need to
do some additions in test/Makefile.  More on this later.


Naming conventions
=================

A test executable is named test/{name}test.c

A test recipe is named test/recipes/{nn}-test_{name}.t, where {nn} is a two
digit number and {name} is a unique name of your choice.

The number {nn} is (somewhat loosely) grouped as follows:

00-04  sanity, internal and essential API tests
05-09  individual symmetric cipher algorithms
10-14  math (bignum)
15-19  individual asymmetric cipher algorithms
20-24  openssl commands (some otherwise not tested)
25-29  certificate forms, generation and verification
30-35  engine and evp
60-79  APIs
   70  PACKET layer
80-89  "larger" protocols (CA, CMS, OCSP, SSL, TSA)
90-98  misc
99     most time consuming tests [such as test_fuzz]


A recipe that just runs a test executable
=========================================

A script that just runs a program looks like this:

    #! /usr/bin/perl

    use OpenSSL::Test::Simple;

    simple_test("test_{name}", "{name}test", "{name}");

{name} is the unique name you have chosen for your test.

The second argument to `simple_test' is the test executable, and `simple_test'
expects it to be located in test/

For documentation on OpenSSL::Test::Simple, do
`perldoc util/perl/OpenSSL/Test/Simple.pm'.


A recipe that runs a more complex test
======================================

For more complex tests, you will need to read up on Test::More and
OpenSSL::Test.  Test::More is normally preinstalled, do `man Test::More' for
documentation.  For OpenSSL::Test, do `perldoc util/perl/OpenSSL/Test.pm'.

A script to start from could be this:

    #! /usr/bin/perl

    use strict;
    use warnings;
    use OpenSSL::Test;

    setup("test_{name}");

    plan tests => 2;                # The number of tests being performed

    ok(test1, "test1");
    ok(test2, "test1");

    sub test1
    {
        # test feature 1
    }

    sub test2
    {
        # test feature 2
    }


Changes to test/build.info
==========================

Whenever a new test involves a new test executable you need to do the
following (at all times, replace {NAME} and {name} with the name of your
test):

* add {name} to the list of programs under PROGRAMS_NO_INST

* create a three line description of how to build the test, you will have
to modify the include paths and source files if you don't want to use the
basic test framework:

    SOURCE[{name}]={name}.c
    INCLUDE[{name}]=.. ../include
    DEPEND[{name}]=../libcrypto libtestutil.a

Generic form of C test executables
==================================

    #include "testutil.h"

    static int my_test(void)
    {
        int testresult = 0;                 /* Assume the test will fail    */
        int observed;

        observed = function();              /* Call the code under test     */
        if (!TEST_int_equal(observed, 2))   /* Check the result is correct  */
            goto end;                       /* Exit on failure - optional   */

        testresult = 1;                     /* Mark the test case a success */
    end:
        cleanup();                          /* Any cleanup you require      */
        return testresult;
    }

    int setup_tests(void)
    {
        ADD_TEST(my_test);                  /* Add each test separately     */
        return 1;                           /* Indicate success             */
    }

You should use the TEST_xxx macros provided by testutil.h to test all failure
conditions.  These macros produce an error message in a standard format if the
condition is not met (and nothing if the condition is met).  Additional
information can be presented with the TEST_info macro that takes a printf
format string and arguments.  TEST_error is useful for complicated conditions,
it also takes a printf format string and argument.  In all cases the TEST_xxx
macros are guaranteed to evaluate their arguments exactly once.  This means
that expressions with side effects are allowed as parameters.  Thus,

    if (!TEST_ptr(ptr = OPENSSL_malloc(..)))

works fine and can be used in place of:

    ptr = OPENSSL_malloc(..);
    if (!TEST_ptr(ptr))

The former produces a more meaningful message on failure than the latter.