diff options
Diffstat (limited to 'src/lib/libssl/tls13_lib.c')
-rw-r--r-- | src/lib/libssl/tls13_lib.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/libssl/tls13_lib.c b/src/lib/libssl/tls13_lib.c index 651c34ca29..017cc887b8 100644 --- a/src/lib/libssl/tls13_lib.c +++ b/src/lib/libssl/tls13_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tls13_lib.c,v 1.71 2022/09/10 15:29:33 jsing Exp $ */ | 1 | /* $OpenBSD: tls13_lib.c,v 1.72 2022/10/02 16:36:42 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2018, 2019 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2018, 2019 Joel Sing <jsing@openbsd.org> |
4 | * Copyright (c) 2019 Bob Beck <beck@openbsd.org> | 4 | * Copyright (c) 2019 Bob Beck <beck@openbsd.org> |
@@ -110,7 +110,7 @@ tls13_alert_received_cb(uint8_t alert_desc, void *arg) | |||
110 | 110 | ||
111 | if (alert_desc == TLS13_ALERT_CLOSE_NOTIFY) { | 111 | if (alert_desc == TLS13_ALERT_CLOSE_NOTIFY) { |
112 | ctx->close_notify_recv = 1; | 112 | ctx->close_notify_recv = 1; |
113 | ctx->ssl->internal->shutdown |= SSL_RECEIVED_SHUTDOWN; | 113 | ctx->ssl->shutdown |= SSL_RECEIVED_SHUTDOWN; |
114 | ctx->ssl->s3->warn_alert = alert_desc; | 114 | ctx->ssl->s3->warn_alert = alert_desc; |
115 | return; | 115 | return; |
116 | } | 116 | } |
@@ -158,7 +158,7 @@ tls13_legacy_handshake_message_recv_cb(void *arg) | |||
158 | SSL *s = ctx->ssl; | 158 | SSL *s = ctx->ssl; |
159 | CBS cbs; | 159 | CBS cbs; |
160 | 160 | ||
161 | if (s->internal->msg_callback == NULL) | 161 | if (s->msg_callback == NULL) |
162 | return; | 162 | return; |
163 | 163 | ||
164 | tls13_handshake_msg_data(ctx->hs_msg, &cbs); | 164 | tls13_handshake_msg_data(ctx->hs_msg, &cbs); |
@@ -172,7 +172,7 @@ tls13_legacy_handshake_message_sent_cb(void *arg) | |||
172 | SSL *s = ctx->ssl; | 172 | SSL *s = ctx->ssl; |
173 | CBS cbs; | 173 | CBS cbs; |
174 | 174 | ||
175 | if (s->internal->msg_callback == NULL) | 175 | if (s->msg_callback == NULL) |
176 | return; | 176 | return; |
177 | 177 | ||
178 | tls13_handshake_msg_data(ctx->hs_msg, &cbs); | 178 | tls13_handshake_msg_data(ctx->hs_msg, &cbs); |
@@ -195,11 +195,11 @@ tls13_legacy_ocsp_status_recv_cb(void *arg) | |||
195 | SSL *s = ctx->ssl; | 195 | SSL *s = ctx->ssl; |
196 | int ret; | 196 | int ret; |
197 | 197 | ||
198 | if (s->ctx->internal->tlsext_status_cb == NULL) | 198 | if (s->ctx->tlsext_status_cb == NULL) |
199 | return 1; | 199 | return 1; |
200 | 200 | ||
201 | ret = s->ctx->internal->tlsext_status_cb(s, | 201 | ret = s->ctx->tlsext_status_cb(s, |
202 | s->ctx->internal->tlsext_status_arg); | 202 | s->ctx->tlsext_status_arg); |
203 | if (ret < 0) { | 203 | if (ret < 0) { |
204 | ctx->alert = TLS13_ALERT_INTERNAL_ERROR; | 204 | ctx->alert = TLS13_ALERT_INTERNAL_ERROR; |
205 | SSLerror(s, ERR_R_MALLOC_FAILURE); | 205 | SSLerror(s, ERR_R_MALLOC_FAILURE); |
@@ -413,7 +413,7 @@ tls13_ctx_new(int mode, SSL *ssl) | |||
413 | 413 | ||
414 | ctx->middlebox_compat = 1; | 414 | ctx->middlebox_compat = 1; |
415 | 415 | ||
416 | ssl->internal->tls13 = ctx; | 416 | ssl->tls13 = ctx; |
417 | 417 | ||
418 | if (SSL_is_quic(ssl)) { | 418 | if (SSL_is_quic(ssl)) { |
419 | if (!tls13_quic_init(ctx)) | 419 | if (!tls13_quic_init(ctx)) |