diff options
| author | Rich Salz <rsalz@openssl.org> | 2016-12-08 14:18:40 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-01-09 22:26:47 -0500 |
| commit | aff8c126fd8db84fa4ef623997a8c4200a14a44f (patch) | |
| tree | 88739b836a2ed7f812fcb919cf3bfdae4d4f7b92 /test | |
| parent | 18e3ab7bc4fd5711014d60ddf40cda25988e4e18 (diff) | |
Move extension data into sub-structs
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2052)
Diffstat (limited to 'test')
| -rw-r--r-- | test/handshake_helper.c | 8 | ||||
| -rw-r--r-- | test/ossl_shim/ossl_shim.cc | 2 | ||||
| -rw-r--r-- | test/ssltest_old.c | 10 |
3 files changed, 9 insertions, 11 deletions
diff --git a/test/handshake_helper.c b/test/handshake_helper.c index bf647f1690..9ffd0bf427 100644 --- a/test/handshake_helper.c +++ b/test/handshake_helper.c @@ -378,16 +378,16 @@ static void configure_handshake_ctx(SSL_CTX *server_ctx, SSL_CTX *server2_ctx, parse_protos(extra->server.npn_protocols, &server_ctx_data->npn_protocols, &server_ctx_data->npn_protocols_len); - SSL_CTX_set_next_protos_advertised_cb(server_ctx, server_npn_cb, - server_ctx_data); + SSL_CTX_set_npn_advertised_cb(server_ctx, server_npn_cb, + server_ctx_data); } if (extra->server2.npn_protocols != NULL) { parse_protos(extra->server2.npn_protocols, &server2_ctx_data->npn_protocols, &server2_ctx_data->npn_protocols_len); TEST_check(server2_ctx != NULL); - SSL_CTX_set_next_protos_advertised_cb(server2_ctx, server_npn_cb, - server2_ctx_data); + SSL_CTX_set_npn_advertised_cb(server2_ctx, server_npn_cb, + server2_ctx_data); } if (extra->client.npn_protocols != NULL) { parse_protos(extra->client.npn_protocols, diff --git a/test/ossl_shim/ossl_shim.cc b/test/ossl_shim/ossl_shim.cc index 4da340be2d..79edaddae4 100644 --- a/test/ossl_shim/ossl_shim.cc +++ b/test/ossl_shim/ossl_shim.cc @@ -589,7 +589,7 @@ static bssl::UniquePtr<SSL_CTX> SetupCtx(const TestConfig *config) { SSL_CTX_set_client_cert_cb(ssl_ctx.get(), ClientCertCallback); } - SSL_CTX_set_next_protos_advertised_cb( + SSL_CTX_set_npn_advertised_cb( ssl_ctx.get(), NextProtosAdvertisedCallback, NULL); if (!config->select_next_proto.empty()) { SSL_CTX_set_next_proto_select_cb(ssl_ctx.get(), NextProtoSelectCallback, diff --git a/test/ssltest_old.c b/test/ssltest_old.c index c19ab98de0..1bfa983122 100644 --- a/test/ssltest_old.c +++ b/test/ssltest_old.c @@ -1662,14 +1662,12 @@ int main(int argc, char *argv[]) "Can't have both -npn_server and -npn_server_reject\n"); goto end; } - SSL_CTX_set_next_protos_advertised_cb(s_ctx, cb_server_npn, NULL); - SSL_CTX_set_next_protos_advertised_cb(s_ctx2, cb_server_npn, NULL); + SSL_CTX_set_npn_advertised_cb(s_ctx, cb_server_npn, NULL); + SSL_CTX_set_npn_advertised_cb(s_ctx2, cb_server_npn, NULL); } if (npn_server_reject) { - SSL_CTX_set_next_protos_advertised_cb(s_ctx, cb_server_rejects_npn, - NULL); - SSL_CTX_set_next_protos_advertised_cb(s_ctx2, cb_server_rejects_npn, - NULL); + SSL_CTX_set_npn_advertised_cb(s_ctx, cb_server_rejects_npn, NULL); + SSL_CTX_set_npn_advertised_cb(s_ctx2, cb_server_rejects_npn, NULL); } #endif |