diff options
author | jsing <> | 2022-10-02 16:36:42 +0000 |
---|---|---|
committer | jsing <> | 2022-10-02 16:36:42 +0000 |
commit | 7a087580717329de5ef02600e4e1489d86249a88 (patch) | |
tree | 739f174130582d68ff159ff94cdb3fb2185e31ef /src/lib/libssl/tls13_server.c | |
parent | d5e660940f76ba9fedb2400c0fa888e996ee93c9 (diff) | |
download | openbsd-7a087580717329de5ef02600e4e1489d86249a88.tar.gz openbsd-7a087580717329de5ef02600e4e1489d86249a88.tar.bz2 openbsd-7a087580717329de5ef02600e4e1489d86249a88.zip |
Get rid of SSL_CTX_INTERNAL and SSL_INTERNAL.
These are no longer necessary due to SSL_CTX and SSL now being fully
opaque. Merge SSL_CTX_INTERNAL back into SSL_CTX and SSL_INTERNAL back
into SSL.
Prompted by tb@
Diffstat (limited to 'src/lib/libssl/tls13_server.c')
-rw-r--r-- | src/lib/libssl/tls13_server.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/tls13_server.c b/src/lib/libssl/tls13_server.c index 82350702dc..7bbc541c82 100644 --- a/src/lib/libssl/tls13_server.c +++ b/src/lib/libssl/tls13_server.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tls13_server.c,v 1.103 2022/09/17 17:14:06 jsing Exp $ */ | 1 | /* $OpenBSD: tls13_server.c,v 1.104 2022/10/02 16:36:42 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2019, 2020 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2019, 2020 Joel Sing <jsing@openbsd.org> |
4 | * Copyright (c) 2020 Bob Beck <beck@openbsd.org> | 4 | * Copyright (c) 2020 Bob Beck <beck@openbsd.org> |
@@ -37,7 +37,7 @@ tls13_server_init(struct tls13_ctx *ctx) | |||
37 | s->version = ctx->hs->our_max_tls_version; | 37 | s->version = ctx->hs->our_max_tls_version; |
38 | 38 | ||
39 | tls13_record_layer_set_retry_after_phh(ctx->rl, | 39 | tls13_record_layer_set_retry_after_phh(ctx->rl, |
40 | (s->internal->mode & SSL_MODE_AUTO_RETRY) != 0); | 40 | (s->mode & SSL_MODE_AUTO_RETRY) != 0); |
41 | 41 | ||
42 | if (!ssl_get_new_session(s, 0)) /* XXX */ | 42 | if (!ssl_get_new_session(s, 0)) /* XXX */ |
43 | return 0; | 43 | return 0; |
@@ -656,7 +656,7 @@ tls13_server_certificate_send(struct tls13_ctx *ctx, CBB *cbb) | |||
656 | if ((chain = cpk->chain) == NULL) | 656 | if ((chain = cpk->chain) == NULL) |
657 | chain = s->ctx->extra_certs; | 657 | chain = s->ctx->extra_certs; |
658 | 658 | ||
659 | if (chain == NULL && !(s->internal->mode & SSL_MODE_NO_AUTO_CHAIN)) { | 659 | if (chain == NULL && !(s->mode & SSL_MODE_NO_AUTO_CHAIN)) { |
660 | if ((xsc = X509_STORE_CTX_new()) == NULL) | 660 | if ((xsc = X509_STORE_CTX_new()) == NULL) |
661 | goto err; | 661 | goto err; |
662 | if (!X509_STORE_CTX_init(xsc, s->ctx->cert_store, cpk->x509, NULL)) | 662 | if (!X509_STORE_CTX_init(xsc, s->ctx->cert_store, cpk->x509, NULL)) |