diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-03-08 01:09:44 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-11-03 18:38:23 +0100 |
| commit | 573e4bf0ba3daa9735b6f689407caa9d39ac4d0c (patch) | |
| tree | 5231d84bf52043454b3287eedfa645b26995cd12 /test | |
| parent | f4aa6222bbd5955b37246155bc38ab1af94189b0 (diff) | |
Adapt two test programs that were using now deprecated functions
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8442)
Diffstat (limited to 'test')
| -rw-r--r-- | test/danetest.c | 2 | ||||
| -rw-r--r-- | test/ssltest_old.c | 15 |
2 files changed, 10 insertions, 7 deletions
diff --git a/test/danetest.c b/test/danetest.c index 26745f908e..2c228ecc52 100644 --- a/test/danetest.c +++ b/test/danetest.c @@ -393,7 +393,7 @@ static int run_tlsatest(void) if (!TEST_ptr(f = BIO_new_file(tlsafile, "r")) || !TEST_ptr(ctx = SSL_CTX_new(TLS_client_method())) || !TEST_int_gt(SSL_CTX_dane_enable(ctx), 0) - || !TEST_true(SSL_CTX_load_verify_locations(ctx, CAfile, NULL)) + || !TEST_true(SSL_CTX_load_verify_file(ctx, CAfile)) || !TEST_int_gt(SSL_CTX_dane_mtype_set(ctx, EVP_sha512(), 2, 1), 0) || !TEST_int_gt(SSL_CTX_dane_mtype_set(ctx, EVP_sha256(), 1, 2), diff --git a/test/ssltest_old.c b/test/ssltest_old.c index 971015c6e6..050470d33e 100644 --- a/test/ssltest_old.c +++ b/test/ssltest_old.c @@ -1492,12 +1492,15 @@ int main(int argc, char *argv[]) (void)no_dhe; #endif - if ((!SSL_CTX_load_verify_locations(s_ctx, CAfile, CApath)) || - (!SSL_CTX_set_default_verify_paths(s_ctx)) || - (!SSL_CTX_load_verify_locations(s_ctx2, CAfile, CApath)) || - (!SSL_CTX_set_default_verify_paths(s_ctx2)) || - (!SSL_CTX_load_verify_locations(c_ctx, CAfile, CApath)) || - (!SSL_CTX_set_default_verify_paths(c_ctx))) { + if (!(SSL_CTX_load_verify_file(s_ctx, CAfile) + || SSL_CTX_load_verify_dir(s_ctx, CApath)) + || !SSL_CTX_set_default_verify_paths(s_ctx) + || !(SSL_CTX_load_verify_file(s_ctx2, CAfile) + || SSL_CTX_load_verify_dir(s_ctx2, CApath)) + || !SSL_CTX_set_default_verify_paths(s_ctx2) + || !(SSL_CTX_load_verify_file(c_ctx, CAfile) + || SSL_CTX_load_verify_dir(c_ctx, CApath)) + || !SSL_CTX_set_default_verify_paths(c_ctx)) { ERR_print_errors(bio_err); } |