diff options
author | Kurt Roeckx <kurt@roeckx.be> | 2018-12-09 20:53:05 +0100 |
---|---|---|
committer | Kurt Roeckx <kurt@roeckx.be> | 2018-12-15 12:52:02 +0100 |
commit | 5c587fb6b996d47771bcaecd71489e4849103f56 (patch) | |
tree | f71bf7705554609990fbc47aa936f61d942c4c2f /test/ssl_test.c | |
parent | 91c5473035aaf2c0d86e4039c2a29a5b70541905 (diff) | |
download | openssl-5c587fb6b996d47771bcaecd71489e4849103f56.tar.gz |
Use (D)TLS_MAX_VERSION_INTERNAL internally
Use 0 if we don't want to set a minimum or maximum version
Reviewed-by: Matt Caswell <matt@openssl.org>
GH: #7260
Diffstat (limited to 'test/ssl_test.c')
-rw-r--r-- | test/ssl_test.c | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/test/ssl_test.c b/test/ssl_test.c index 16cb72507d..4f82bf7256 100644 --- a/test/ssl_test.c +++ b/test/ssl_test.c @@ -406,8 +406,7 @@ static int test_handshake(int idx) #ifndef OPENSSL_NO_DTLS if (test_ctx->method == SSL_TEST_METHOD_DTLS) { server_ctx = SSL_CTX_new(DTLS_server_method()); - if (!TEST_true(SSL_CTX_set_max_proto_version(server_ctx, - DTLS_MAX_VERSION))) + 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) { @@ -415,17 +414,14 @@ static int test_handshake(int idx) goto err; } client_ctx = SSL_CTX_new(DTLS_client_method()); - if (!TEST_true(SSL_CTX_set_max_proto_version(client_ctx, - DTLS_MAX_VERSION))) + 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(DTLS_server_method()); - if (!TEST_true(SSL_CTX_set_max_proto_version(resume_server_ctx, - DTLS_MAX_VERSION))) + if (!TEST_true(SSL_CTX_set_max_proto_version(resume_server_ctx, 0))) goto err; resume_client_ctx = SSL_CTX_new(DTLS_client_method()); - if (!TEST_true(SSL_CTX_set_max_proto_version(resume_client_ctx, - DTLS_MAX_VERSION))) + if (!TEST_true(SSL_CTX_set_max_proto_version(resume_client_ctx, 0))) goto err; if (!TEST_ptr(resume_server_ctx) || !TEST_ptr(resume_client_ctx)) @@ -435,31 +431,26 @@ static int test_handshake(int idx) #endif if (test_ctx->method == SSL_TEST_METHOD_TLS) { server_ctx = SSL_CTX_new(TLS_server_method()); - if (!TEST_true(SSL_CTX_set_max_proto_version(server_ctx, - TLS_MAX_VERSION))) + 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(TLS_server_method()))) goto err; - if (!TEST_true(SSL_CTX_set_max_proto_version(server2_ctx, - TLS_MAX_VERSION))) + if (!TEST_true(SSL_CTX_set_max_proto_version(server2_ctx, 0))) goto err; } client_ctx = SSL_CTX_new(TLS_client_method()); - if (!TEST_true(SSL_CTX_set_max_proto_version(client_ctx, - TLS_MAX_VERSION))) + 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(TLS_server_method()); - if (!TEST_true(SSL_CTX_set_max_proto_version(resume_server_ctx, - TLS_MAX_VERSION))) + if (!TEST_true(SSL_CTX_set_max_proto_version(resume_server_ctx, 0))) goto err; resume_client_ctx = SSL_CTX_new(TLS_client_method()); - if (!TEST_true(SSL_CTX_set_max_proto_version(resume_client_ctx, - TLS_MAX_VERSION))) + if (!TEST_true(SSL_CTX_set_max_proto_version(resume_client_ctx, 0))) goto err; if (!TEST_ptr(resume_server_ctx) || !TEST_ptr(resume_client_ctx)) |