diff options
| author | Matt Caswell <matt@openssl.org> | 2020-09-24 10:42:23 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-10-01 09:25:20 +0100 |
| commit | d8652be06e2778e8898453a391deb7253e1a35a2 (patch) | |
| tree | fe40e22edb39642aa7ae633320c1900388f2e7ee /test/ssl_test.c | |
| parent | aedac96c1172ca9a9efe72e027e935504b599e2f (diff) | |
| download | openssl-new-d8652be06e2778e8898453a391deb7253e1a35a2.tar.gz | |
Run the withlibctx.pl script
Automatically rename all instances of _with_libctx() to _ex() as per
our coding style.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12970)
Diffstat (limited to 'test/ssl_test.c')
| -rw-r--r-- | test/ssl_test.c | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/test/ssl_test.c b/test/ssl_test.c index 1fbe938309..4b7e26b4c1 100644 --- a/test/ssl_test.c +++ b/test/ssl_test.c @@ -408,26 +408,25 @@ static int test_handshake(int idx) #ifndef OPENSSL_NO_DTLS if (test_ctx->method == SSL_TEST_METHOD_DTLS) { - server_ctx = SSL_CTX_new_with_libctx(libctx, NULL, DTLS_server_method()); + server_ctx = SSL_CTX_new_ex(libctx, NULL, DTLS_server_method()); if (!TEST_true(SSL_CTX_set_max_proto_version(server_ctx, 0))) goto err; if (test_ctx->extra.server.servername_callback != SSL_TEST_SERVERNAME_CB_NONE) { if (!TEST_ptr(server2_ctx = - SSL_CTX_new_with_libctx(libctx, NULL, - DTLS_server_method()))) + SSL_CTX_new_ex(libctx, NULL, DTLS_server_method()))) goto err; } - client_ctx = SSL_CTX_new_with_libctx(libctx, NULL, DTLS_client_method()); + client_ctx = SSL_CTX_new_ex(libctx, NULL, DTLS_client_method()); if (!TEST_true(SSL_CTX_set_max_proto_version(client_ctx, 0))) goto err; if (test_ctx->handshake_mode == SSL_TEST_HANDSHAKE_RESUME) { - resume_server_ctx = SSL_CTX_new_with_libctx(libctx, NULL, - DTLS_server_method()); + resume_server_ctx = SSL_CTX_new_ex(libctx, NULL, + DTLS_server_method()); if (!TEST_true(SSL_CTX_set_max_proto_version(resume_server_ctx, 0))) goto err; - resume_client_ctx = SSL_CTX_new_with_libctx(libctx, NULL, - DTLS_client_method()); + resume_client_ctx = SSL_CTX_new_ex(libctx, NULL, + DTLS_client_method()); if (!TEST_true(SSL_CTX_set_max_proto_version(resume_client_ctx, 0))) goto err; if (!TEST_ptr(resume_server_ctx) @@ -437,30 +436,29 @@ static int test_handshake(int idx) } #endif if (test_ctx->method == SSL_TEST_METHOD_TLS) { - server_ctx = SSL_CTX_new_with_libctx(libctx, NULL, TLS_server_method()); + server_ctx = SSL_CTX_new_ex(libctx, NULL, TLS_server_method()); if (!TEST_true(SSL_CTX_set_max_proto_version(server_ctx, 0))) goto err; /* SNI on resumption isn't supported/tested yet. */ if (test_ctx->extra.server.servername_callback != SSL_TEST_SERVERNAME_CB_NONE) { if (!TEST_ptr(server2_ctx = - SSL_CTX_new_with_libctx(libctx, NULL, - TLS_server_method()))) + SSL_CTX_new_ex(libctx, NULL, TLS_server_method()))) goto err; if (!TEST_true(SSL_CTX_set_max_proto_version(server2_ctx, 0))) goto err; } - client_ctx = SSL_CTX_new_with_libctx(libctx, NULL, TLS_client_method()); + client_ctx = SSL_CTX_new_ex(libctx, NULL, TLS_client_method()); if (!TEST_true(SSL_CTX_set_max_proto_version(client_ctx, 0))) goto err; if (test_ctx->handshake_mode == SSL_TEST_HANDSHAKE_RESUME) { - resume_server_ctx = SSL_CTX_new_with_libctx(libctx, NULL, - TLS_server_method()); + resume_server_ctx = SSL_CTX_new_ex(libctx, NULL, + TLS_server_method()); if (!TEST_true(SSL_CTX_set_max_proto_version(resume_server_ctx, 0))) goto err; - resume_client_ctx = SSL_CTX_new_with_libctx(libctx, NULL, - TLS_client_method()); + resume_client_ctx = SSL_CTX_new_ex(libctx, NULL, + TLS_client_method()); if (!TEST_true(SSL_CTX_set_max_proto_version(resume_client_ctx, 0))) goto err; if (!TEST_ptr(resume_server_ctx) |