c0a445a9f2
As documented both SSL_get0_dane_authority() and SSL_get0_dane_tlsa() are expected to return a negative match depth and nothing else when verification fails. However, this only happened when verification failed during chain construction. Errors in verification of the constructed chain did not have the intended effect on these functions. This commit updates the functions to check for verify_result == X509_V_OK, and no longer erases any accumulated match information when chain construction fails. Sophisticated developers can, with care, use SSL_set_verify_result(ssl, X509_V_OK) to "peek" at TLSA info even when verification fail. They must of course first check and save the real error, and restore the original error as quickly as possible. Hiding by default seems to be the safer interface. Introduced X509_V_ERR_DANE_NO_MATCH code to signal failure to find matching TLSA records. Previously reported via X509_V_ERR_CERT_UNTRUSTED. This also changes the "-brief" output from s_client to include verification results and TLSA match information. Mentioned session resumption in code example in SSL_CTX_dane_enable(3). Also mentioned that depths returned are relative to the verified chain which is now available via SSL_get0_verified_chain(3). Added a few more test-cases to danetest, that exercise the new code. Resolved thread safety issue in use of static buffer in X509_verify_cert_error_string(). Fixed long-stating issue in apps/s_cb.c which always sets verify_error to either X509_V_OK or "chain to long", code elsewhere (e.g. s_time.c), seems to expect the actual error. [ The new chain construction code is expected to correctly generate "chain too long" errors, so at some point we need to drop the work-arounds, once SSL_set_verify_depth() is also fixed to propagate the depth to X509_STORE_CTX reliably. ] Reviewed-by: Rich Salz <rsalz@openssl.org> |
||
---|---|---|
.. | ||
Attic | ||
certs | ||
ocsp-tests | ||
recipes | ||
smime-certs | ||
testlib/OpenSSL | ||
asynctest.c | ||
bftest.c | ||
bntest.c | ||
build.info | ||
CAss.cnf | ||
CAssdh.cnf | ||
CAssdsa.cnf | ||
CAssrsa.cnf | ||
casttest.c | ||
CAtsa.cnf | ||
clean_test.com | ||
clienthellotest.c | ||
cms-examples.pl | ||
constant_time_test.c | ||
danetest.c | ||
danetest.in | ||
danetest.pem | ||
destest.c | ||
dhtest.c | ||
dsatest.c | ||
dtlsv1listentest.c | ||
dummytest.c | ||
ecdhtest.c | ||
ecdsatest.c | ||
ectest.c | ||
enginetest.c | ||
evp_extra_test.c | ||
evp_test.c | ||
evptests.txt | ||
exdatatest.c | ||
exptest.c | ||
gmdifftest.c | ||
heartbeat_test.c | ||
hmactest.c | ||
ideatest.c | ||
igetest.c | ||
jpaketest.c | ||
Makefile.in | ||
maketests.com | ||
md2test.c | ||
md4test.c | ||
md5test.c | ||
mdc2test.c | ||
memleaktest.c | ||
methtest.c | ||
nptest.c | ||
P1ss.cnf | ||
P2ss.cnf | ||
p5_crpt2_test.c | ||
packettest.c | ||
pbelutest.c | ||
pkcs7-1.pem | ||
pkcs7.pem | ||
pkits-test.pl | ||
r160test.c | ||
randtest.c | ||
rc2test.c | ||
rc4test.c | ||
rc5test.c | ||
README | ||
rmdtest.c | ||
rsa_test.c | ||
run_tests.pl | ||
secmemtest.c | ||
serverinfo.pem | ||
sha1test.c | ||
sha256t.c | ||
sha512t.c | ||
smcont.txt | ||
srptest.c | ||
ssltest.c | ||
Sssdsa.cnf | ||
Sssrsa.cnf | ||
test.cnf | ||
test_aesni | ||
test_padlock | ||
test_t4 | ||
testcrl.pem | ||
testdsa.pem | ||
testdsapub.pem | ||
testec-p256.pem | ||
testecpub-p256.pem | ||
testp7.pem | ||
testreq2.pem | ||
testrsa.pem | ||
testrsapub.pem | ||
tests.com | ||
testsid.pem | ||
testutil.c | ||
testutil.h | ||
testx509.pem | ||
times | ||
Uss.cnf | ||
v3-cert1.pem | ||
v3-cert2.pem | ||
v3nametest.c | ||
verify_extra_test.c | ||
wp_test.c |
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 convetions ================= 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: 05 individual symmetric cipher algorithms 10 math (bignum) 15 individual asymmetric cipher algorithms 20 openssl enc 25 certificate forms, generation and verification 30 engine and evp 70 PACKET layer 80 "larger" protocols (CA, CMS, OCSP, SSL, TSA) 90 misc 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 test/testlib/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 test/testlib/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/Makefile ======================== 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): * among the variables for test executables at the beginning, add a line like this: {NAME}TEST= {name}test * add `$({NAME}TEST)$(EXE_EXT)' to the assignment of EXE: * add `$({NAME}TEST).o' to the assignment of OBJ: * add `$({NAME}TEST).c' to the assignment of SRC: * add the following lines for building the executable: $({NAME}TEST)$(EXE_EXT): $({NAME}TEST).o $(DLIBCRYPTO) @target=$({NAME}TEST); $(BUILD_CMD)