diff options
author | jsing <> | 2022-08-21 19:46:19 +0000 |
---|---|---|
committer | jsing <> | 2022-08-21 19:46:19 +0000 |
commit | 26f09e9deb62f8eab0a3cc7da8917dd632b1c770 (patch) | |
tree | 60cd8b725f153ec3283f8bab14c2c7ff3297cd3a | |
parent | 98775205fa6daaa784876d020a9f743bbffbf9f7 (diff) | |
download | openbsd-26f09e9deb62f8eab0a3cc7da8917dd632b1c770.tar.gz openbsd-26f09e9deb62f8eab0a3cc7da8917dd632b1c770.tar.bz2 openbsd-26f09e9deb62f8eab0a3cc7da8917dd632b1c770.zip |
Revise regress now that SSL_QUIC_METHOD exists.
-rw-r--r-- | src/regress/lib/libssl/tlsext/tlsexttest.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/regress/lib/libssl/tlsext/tlsexttest.c b/src/regress/lib/libssl/tlsext/tlsexttest.c index 6054cf1f0e..c6f9240853 100644 --- a/src/regress/lib/libssl/tlsext/tlsexttest.c +++ b/src/regress/lib/libssl/tlsext/tlsexttest.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tlsexttest.c,v 1.74 2022/08/05 17:19:09 tb Exp $ */ | 1 | /* $OpenBSD: tlsexttest.c,v 1.75 2022/08/21 19:46:19 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2017 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2017 Joel Sing <jsing@openbsd.org> |
4 | * Copyright (c) 2017 Doug Hogan <doug@openbsd.org> | 4 | * Copyright (c) 2017 Doug Hogan <doug@openbsd.org> |
@@ -2038,6 +2038,7 @@ static unsigned char tlsext_quic_transport_data[] = { | |||
2038 | static int | 2038 | static int |
2039 | test_tlsext_quic_transport_parameters_client(void) | 2039 | test_tlsext_quic_transport_parameters_client(void) |
2040 | { | 2040 | { |
2041 | const SSL_QUIC_METHOD quic_method; | ||
2041 | unsigned char *data = NULL; | 2042 | unsigned char *data = NULL; |
2042 | SSL_CTX *ssl_ctx = NULL; | 2043 | SSL_CTX *ssl_ctx = NULL; |
2043 | SSL *ssl = NULL; | 2044 | SSL *ssl = NULL; |
@@ -2089,7 +2090,7 @@ test_tlsext_quic_transport_parameters_client(void) | |||
2089 | goto err; | 2090 | goto err; |
2090 | } | 2091 | } |
2091 | 2092 | ||
2092 | ssl->quic_method = ssl->method; /* XXX */ | 2093 | ssl->quic_method = &quic_method; |
2093 | 2094 | ||
2094 | if (!client_funcs->needs(ssl, SSL_TLSEXT_MSG_CH)) { | 2095 | if (!client_funcs->needs(ssl, SSL_TLSEXT_MSG_CH)) { |
2095 | FAIL("client should need QUIC\n"); | 2096 | FAIL("client should need QUIC\n"); |
@@ -2169,6 +2170,7 @@ test_tlsext_quic_transport_parameters_client(void) | |||
2169 | static int | 2170 | static int |
2170 | test_tlsext_quic_transport_parameters_server(void) | 2171 | test_tlsext_quic_transport_parameters_server(void) |
2171 | { | 2172 | { |
2173 | const SSL_QUIC_METHOD quic_method; | ||
2172 | unsigned char *data = NULL; | 2174 | unsigned char *data = NULL; |
2173 | SSL_CTX *ssl_ctx = NULL; | 2175 | SSL_CTX *ssl_ctx = NULL; |
2174 | SSL *ssl = NULL; | 2176 | SSL *ssl = NULL; |
@@ -2212,7 +2214,7 @@ test_tlsext_quic_transport_parameters_server(void) | |||
2212 | goto err; | 2214 | goto err; |
2213 | } | 2215 | } |
2214 | 2216 | ||
2215 | ssl->quic_method = ssl->method; /* XXX */ | 2217 | ssl->quic_method = &quic_method; |
2216 | 2218 | ||
2217 | if (!server_funcs->needs(ssl, SSL_TLSEXT_MSG_EE)) { | 2219 | if (!server_funcs->needs(ssl, SSL_TLSEXT_MSG_EE)) { |
2218 | FAIL("server should need QUIC\n"); | 2220 | FAIL("server should need QUIC\n"); |
@@ -2253,7 +2255,7 @@ test_tlsext_quic_transport_parameters_server(void) | |||
2253 | goto err; | 2255 | goto err; |
2254 | } | 2256 | } |
2255 | 2257 | ||
2256 | ssl->quic_method = ssl->method; /* XXX */ | 2258 | ssl->quic_method = &quic_method; |
2257 | 2259 | ||
2258 | if (!client_funcs->parse(ssl, SSL_TLSEXT_MSG_SH, &cbs, &alert)) { | 2260 | if (!client_funcs->parse(ssl, SSL_TLSEXT_MSG_SH, &cbs, &alert)) { |
2259 | FAIL("client_parse of QUIC from server failed\n"); | 2261 | FAIL("client_parse of QUIC from server failed\n"); |