openssl/test
Shane Lontis d63d841fb5 Add the content type attribute to additional CMS signerinfo.
Fixes #8923

Found using the openssl cms -resign option.
This uses an alternate path to do the signing which was not adding the required signed attribute
content type. The content type attribute should always exist since it is required is there are
any signed attributes.
As the signing time attribute is always added in code, the content type attribute is also required.
The CMS_si_check_attributes() method adds validity checks for signed and unsigned attributes
e.g. The message digest attribute is a signed attribute that must exist if any signed attributes
exist, it cannot be an unsigned attribute and there must only be one instance containing a single
value.

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8944)

(cherry picked from commit 19e512a824)
2019-06-03 15:25:10 +10:00
..
certs Fix cert with rsa instead of rsaEncryption as public key algorithm 2018-12-31 09:51:04 +01:00
ct
d2i-tests
ocsp-tests
ossl_shim Fix BoringSSL external test failures 2018-08-22 15:15:19 +01:00
recipes Add the content type attribute to additional CMS signerinfo. 2019-06-03 15:25:10 +10:00
smime-certs
ssl-tests Update copyright year 2019-02-26 14:05:09 +00:00
testutil Update copyright year 2019-02-26 14:05:09 +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_decode_test.c TESTS: add test of decoding of invalid zero length ASN.1 INTEGER zero 2018-09-09 03:35:26 +02:00
asn1_encode_test.c Update copyright year 2019-05-28 14:49:38 +02:00
asn1_internal_test.c Update copyright year 2018-09-11 13:45:17 +01:00
asn1_string_table_test.c
asn1_time_test.c test/asn1_time_test.c: make it work on 64-bit HP-UX. 2018-04-08 11:17:44 +02:00
asynciotest.c Update code for the final RFC version of TLSv1.3 (RFC8446) 2018-08-15 12:33:30 +01:00
asynctest.c Update copyright year 2018-05-29 13:16:04 +01:00
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_callback_test.c Extend the BIO callback tests to check the return value semantics 2018-10-04 14:20:27 +01:00
bio_enc_test.c Fix no-chacha and no-poly1305 2017-08-25 11:34:08 +01:00
bio_memleak_test.c Add test for the BIO_s_mem rdwr->rdonly->rdwr use-case 2019-04-16 10:55:36 +01:00
bioprinttest.c Update copyright year 2019-05-28 14:49:38 +02:00
bntest.c Revert "Statistically test BN_rand_range()." 2019-04-26 07:43:53 +10:00
bntests.pl
build.info Configure: make C++ build tests optional and configurable 2019-05-27 19:05:22 +02: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 Update copyright year 2019-02-26 14:05:09 +00:00
ciphername_test.c Use "" not <> for internal/ includes 2017-08-22 09:54:20 -04:00
clienthellotest.c Update copyright year 2019-02-26 14:05:09 +00:00
cms-examples.pl
cmsapitest.c Add a CMS API test 2018-05-08 08:43:39 +01:00
conf_include_test.c NCONF_get_number refix. 2018-07-11 09:03:22 +10:00
constant_time_test.c Update copyright year 2018-02-27 13:59:42 +00:00
crltest.c Update copyright year 2019-02-26 14:05:09 +00:00
ct_test.c Update copyright year 2019-05-28 14:49:38 +02:00
ctype_internal_test.c Update copyright year 2018-03-20 13:08:46 +00: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 test/dhtest.c: fix resource leak 2018-09-10 10:32:33 +01:00
drbg_cavs_data.c Update copyright year 2018-04-03 13:57:12 +01:00
drbg_cavs_data.h Update copyright year 2018-04-03 13:57:12 +01:00
drbg_cavs_test.c Fix CID 1434549: Unchecked return value in test/evp_test.c 2019-01-08 16:30:01 +10:00
drbgtest.c Update copyright year 2019-02-26 14:05:09 +00:00
drbgtest.h
dsa_no_digest_size_test.c Add test for DSA signatures of raw digests of various sizes 2018-07-29 21:27:36 +02:00
dsatest.c Use "" not <> for internal/ includes 2017-08-22 09:54:20 -04:00
dtls_mtu_test.c Update copyright year 2018-05-29 13:16:04 +01:00
dtlstest.c Update copyright year 2019-02-26 14:05:09 +00:00
dtlsv1listentest.c Update copyright year 2018-05-29 13:16:04 +01:00
ec_internal_test.c [test] unit test for field_inv function pointer in EC_METHOD 2019-02-20 19:55:15 +02:00
ecdsatest.c [test] modernize ecdsatest and extend ECDSA sign KATs 2019-02-26 18:01:52 +02:00
ecdsatest.h [test] modernize ecdsatest and extend ECDSA sign KATs 2019-02-26 18:01:52 +02:00
ecstresstest.c Update copyright year 2018-09-11 13:45:17 +01:00
ectest.c Update copyright year 2019-05-28 14:49:38 +02:00
enginetest.c Add EVP_PKEY_METHOD redirection test 2017-10-12 00:03:32 +01:00
errtest.c Save and restore the Windows error around TlsGetValue. 2018-05-23 17:34:54 -04:00
evp_extra_test.c fixed public range check in ec_GF2m_simple_oct2point 2019-03-30 14:51:47 +01:00
evp_test.c Allow specifying the tag after AAD in CCM mode 2019-05-08 11:02:42 +01:00
evp_test.h
exdatatest.c Update copyright year 2018-05-29 13:16:04 +01:00
exptest.c Use "" not <> for internal/ includes 2017-08-22 09:54:20 -04:00
fatalerrtest.c Update copyright year 2018-03-20 13:08:46 +00:00
generate_buildtest.pl Update copyright year 2018-05-29 13:16:04 +01:00
generate_ssl_tests.pl
gmdifftest.c
gosttest.c Add a GOST test 2018-07-13 18:14:43 +01:00
handshake_helper.c Update copyright year 2019-02-26 14:05:09 +00:00
handshake_helper.h Update copyright year 2018-03-20 13:08:46 +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 Update copyright year 2018-05-29 13:16:04 +01:00
mdc2test.c Use "" not <> for internal/ includes 2017-08-22 09:54:20 -04:00
memleaktest.c
modes_internal_test.c Use void in all function definitions that do not take any arguments 2018-05-11 14:37:48 +02:00
ocspapitest.c Update copyright year 2019-05-28 14:49:38 +02:00
P1ss.cnf
P2ss.cnf
packettest.c Update copyright year 2018-03-20 13:08:46 +00:00
pbelutest.c
pemtest.c Update copyright year 2018-09-11 13:45:17 +01:00
pkcs7-1.pem
pkcs7.pem
pkey_meth_kdf_test.c Update copyright year 2018-05-29 13:16:04 +01:00
pkey_meth_test.c Update copyright year 2018-05-29 13:16:04 +01:00
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 Update copyright year 2019-02-26 14:05:09 +00:00
README Fix test documentation. 2017-09-08 13:58:59 -05:00
README.external Remove unnecessary trailing whitespace 2019-02-05 16:29:17 +01:00
README.ssltest.md Session resume broken switching contexts 2017-10-04 10:21:08 +10:00
recordlentest.c Update copyright year 2018-03-20 13:08:46 +00:00
rsa_complex.c Add a compile time test to verify that openssl/rsa.h and complex.h can 2018-09-17 09:44:45 +10: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 Add a simple test for RSA_SSLV23_PADDING 2019-03-07 22:58:15 +01:00
run_tests.pl Update copyright year 2018-05-01 13:34:30 +01:00
sanitytest.c Update copyright year 2018-09-11 13:45:17 +01:00
secmemtest.c test/secmemtest: test secure memory only if it is implemented 2018-10-05 12:23:34 +02:00
serverinfo.pem
serverinfo2.pem
servername_test.c Update copyright year 2019-02-26 14:05:09 +00:00
session.pem Don't store the ticket nonce in the session 2018-06-07 10:58:35 +01:00
shibboleth.pfx
shlibloadtest.c Update copyright year 2019-02-26 14:05:09 +00:00
siphash_internal_test.c test/siphash_internal_test.c: ensure the SIPHASH structure is zeroed 2018-11-15 15:35:49 +01:00
sm2_internal_test.c Make SM2 ID stick to specification 2018-09-07 18:12:26 +08: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 Use void in all function definitions that do not take any arguments 2018-05-11 14:37:48 +02:00
ssl_test.c Add a config option to disable automatic config loading 2018-04-17 16:33:15 +02:00
ssl_test.tmpl
ssl_test_ctx.c Update copyright year 2019-02-26 14:05:09 +00:00
ssl_test_ctx.h Update copyright year 2019-02-26 14:05:09 +00:00
ssl_test_ctx_test.c Update copyright year 2018-03-20 13:08:46 +00:00
ssl_test_ctx_test.conf Implement Maximum Fragment Length TLS extension. 2017-11-05 17:46:48 +01:00
sslapitest.c Update copyright year 2019-02-26 14:05:09 +00:00
sslbuffertest.c Update copyright year 2018-03-20 13:08:46 +00:00
sslcorrupttest.c Use void in all function definitions that do not take any arguments 2018-05-11 14:37:48 +02:00
ssltest_old.c Update copyright year 2019-02-26 14:05:09 +00:00
ssltestlib.c Cleanup vxworks support to be able to compile for VxWorks 7 2019-01-24 17:58:27 +01:00
ssltestlib.h Update copyright year 2019-02-26 14:05:09 +00:00
Sssdsa.cnf
Sssrsa.cnf
stack_test.c Add a reserve call to the stack data structure. 2017-09-28 06:53:40 +10:00
sysdefault.cnf Apply system_default configuration on SSL_CTX_new(). 2018-03-19 10:22:49 -04:00
sysdefaulttest.c Update copyright year 2018-03-20 13:08:46 +00:00
test.cnf
test_test.c Relocate memcmp test. 2018-08-07 10:51:01 +10:00
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 Update copyright year 2018-05-29 13:16:04 +01:00
tls13ccstest.c Use void in all function definitions that do not take any arguments 2018-05-11 14:37:48 +02:00
tls13encryptiontest.c Update the TLSv1.3 test vectors 2018-07-20 10:45:41 +01:00
tls13secretstest.c Update copyright year 2019-02-26 14:05:09 +00:00
uitest.c
Uss.cnf
v3-cert1.pem
v3-cert2.pem
v3ext.c
v3nametest.c Use void in all function definitions that do not take any arguments 2018-05-11 14:37:48 +02:00
verify_extra_test.c Update copyright year 2018-05-01 13:34:30 +01:00
versions.c Refuse to run test_cipherlist unless shared library matches build 2018-03-31 16:40:07 +02:00
wpackettest.c
x509_check_cert_pkey_test.c
x509_dup_cert_test.c
x509_internal_test.c Update copyright year 2018-05-29 13:16:04 +01:00
x509_time_test.c Update copyright year 2018-05-29 13:16:04 +01:00
x509aux.c Update copyright year 2019-02-26 14:05:09 +00: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.