From 41318db5497cddfa4935c4ea48bcb2eb5786375e Mon Sep 17 00:00:00 2001 From: jsing <> Date: Sun, 2 Oct 2022 16:38:23 +0000 Subject: Revise for SSL_CTX_INTERNAL and SSL_INTERNAL removal. --- src/regress/lib/libssl/unit/cipher_list.c | 4 ++-- src/regress/lib/libssl/unit/ssl_versions.c | 10 +++++----- src/regress/lib/libssl/unit/tls_ext_alpn.c | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/regress/lib/libssl/unit') diff --git a/src/regress/lib/libssl/unit/cipher_list.c b/src/regress/lib/libssl/unit/cipher_list.c index 0623dd69eb..543db41c24 100644 --- a/src/regress/lib/libssl/unit/cipher_list.c +++ b/src/regress/lib/libssl/unit/cipher_list.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cipher_list.c,v 1.11 2022/07/07 13:11:45 tb Exp $ */ +/* $OpenBSD: cipher_list.c,v 1.12 2022/10/02 16:38:23 jsing Exp $ */ /* * Copyright (c) 2015 Doug Hogan * Copyright (c) 2015 Joel Sing @@ -129,7 +129,7 @@ ssl_list_to_bytes_no_scsv(SSL *s, STACK_OF(SSL_CIPHER) **ciphers) buf[buflen - 1] = 0xab; /* Set renegotiate so it doesn't add SCSV */ - s->internal->renegotiate = 1; + s->renegotiate = 1; CHECK(CBB_init_fixed(&cbb, buf, buflen)); CHECK(ssl_cipher_list_to_bytes(s, *ciphers, &cbb)); diff --git a/src/regress/lib/libssl/unit/ssl_versions.c b/src/regress/lib/libssl/unit/ssl_versions.c index 8a6360557f..e9bcecafe5 100644 --- a/src/regress/lib/libssl/unit/ssl_versions.c +++ b/src/regress/lib/libssl/unit/ssl_versions.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_versions.c,v 1.17 2022/02/08 19:06:56 tb Exp $ */ +/* $OpenBSD: ssl_versions.c,v 1.18 2022/10/02 16:38:23 jsing Exp $ */ /* * Copyright (c) 2016, 2017 Joel Sing * @@ -214,8 +214,8 @@ test_ssl_enabled_version_range(void) SSL_set_options(ssl, vrt->options); minver = maxver = 0xffff; - ssl->internal->min_tls_version = vrt->minver; - ssl->internal->max_tls_version = vrt->maxver; + ssl->min_tls_version = vrt->minver; + ssl->max_tls_version = vrt->maxver; if (ssl_enabled_tls_version_range(ssl, &minver, &maxver) != 1) { if (vrt->want_minver != 0 || vrt->want_maxver != 0) { @@ -516,8 +516,8 @@ test_ssl_max_shared_version(void) SSL_set_options(ssl, svt->options); maxver = 0; - ssl->internal->min_tls_version = svt->minver; - ssl->internal->max_tls_version = svt->maxver; + ssl->min_tls_version = svt->minver; + ssl->max_tls_version = svt->maxver; if (!ssl_max_shared_version(ssl, svt->peerver, &maxver)) { if (svt->want_maxver != 0) { diff --git a/src/regress/lib/libssl/unit/tls_ext_alpn.c b/src/regress/lib/libssl/unit/tls_ext_alpn.c index 378929aa5b..f0e4894557 100644 --- a/src/regress/lib/libssl/unit/tls_ext_alpn.c +++ b/src/regress/lib/libssl/unit/tls_ext_alpn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tls_ext_alpn.c,v 1.7 2020/07/03 04:14:10 tb Exp $ */ +/* $OpenBSD: tls_ext_alpn.c,v 1.8 2022/10/02 16:38:23 jsing Exp $ */ /* * Copyright (c) 2015 Doug Hogan * @@ -344,8 +344,8 @@ check_valid_alpn(SSL *s) SSL_CTX_set_alpn_select_cb(s->ctx, dummy_alpn_cb, NULL); /* Prerequisites to test these. */ - CHECK(s->internal->alpn_client_proto_list != NULL); - CHECK(s->ctx->internal->alpn_select_cb != NULL); + CHECK(s->alpn_client_proto_list != NULL); + CHECK(s->ctx->alpn_select_cb != NULL); //CHECK(s->s3->tmp.finish_md_len == 0); CHECK_BOTH(1, 1, proto_single); @@ -376,8 +376,8 @@ check_invalid_alpn(SSL *s) SSL_CTX_set_alpn_select_cb(s->ctx, dummy_alpn_cb, NULL); /* Prerequisites to test these. */ - CHECK(s->internal->alpn_client_proto_list != NULL); - CHECK(s->ctx->internal->alpn_select_cb != NULL); + CHECK(s->alpn_client_proto_list != NULL); + CHECK(s->ctx->alpn_select_cb != NULL); //CHECK(s->s3->tmp.finish_md_len == 0); /* None of these are valid for client or server */ -- cgit v1.2.3-55-g6feb