root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

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)
This commit is contained in:
Richard Levitte 2019-03-08 01:09:44 +01:00
parent f4aa6222bb
commit 573e4bf0ba
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/danetest.c
View File

@ -393,7 +393,7 @@ static int run_tlsatest(void)
if (!TEST_ptr(f = BIO_new_file(tlsafile, "r")) if (!TEST_ptr(f = BIO_new_file(tlsafile, "r"))
|| !TEST_ptr(ctx = SSL_CTX_new(TLS_client_method())) || !TEST_ptr(ctx = SSL_CTX_new(TLS_client_method()))
|| !TEST_int_gt(SSL_CTX_dane_enable(ctx), 0) || !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), || !TEST_int_gt(SSL_CTX_dane_mtype_set(ctx, EVP_sha512(), 2, 1),
0) 0)
|| !TEST_int_gt(SSL_CTX_dane_mtype_set(ctx, EVP_sha256(), 1, 2), || !TEST_int_gt(SSL_CTX_dane_mtype_set(ctx, EVP_sha256(), 1, 2),

15
test/ssltest_old.c
View File

@ -1492,12 +1492,15 @@ int main(int argc, char *argv[])
(void)no_dhe; (void)no_dhe;
#endif #endif
if ((!SSL_CTX_load_verify_locations(s_ctx, CAfile, CApath)) || if (!(SSL_CTX_load_verify_file(s_ctx, CAfile)
(!SSL_CTX_set_default_verify_paths(s_ctx)) || || SSL_CTX_load_verify_dir(s_ctx, CApath))
(!SSL_CTX_load_verify_locations(s_ctx2, CAfile, CApath)) || || !SSL_CTX_set_default_verify_paths(s_ctx)
(!SSL_CTX_set_default_verify_paths(s_ctx2)) || || !(SSL_CTX_load_verify_file(s_ctx2, CAfile)
(!SSL_CTX_load_verify_locations(c_ctx, CAfile, CApath)) || || SSL_CTX_load_verify_dir(s_ctx2, CApath))
(!SSL_CTX_set_default_verify_paths(c_ctx))) { || !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); ERR_print_errors(bio_err);
} }