summaryrefslogtreecommitdiff
path: root/src/lib/libssl/tls13_lib.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/tls13_lib.c')
-rw-r--r--src/lib/libssl/tls13_lib.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libssl/tls13_lib.c b/src/lib/libssl/tls13_lib.c
index 29c81afba3..d3e4050c1e 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.40 2020/05/10 14:17:48 jsing Exp $ */ 1/* $OpenBSD: tls13_lib.c,v 1.41 2020/05/10 16:56:11 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>
@@ -108,14 +108,14 @@ tls13_alert_received_cb(uint8_t alert_desc, void *arg)
108 struct tls13_ctx *ctx = arg; 108 struct tls13_ctx *ctx = arg;
109 SSL *s = ctx->ssl; 109 SSL *s = ctx->ssl;
110 110
111 if (alert_desc == SSL_AD_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->internal->shutdown |= SSL_RECEIVED_SHUTDOWN;
114 S3I(ctx->ssl)->warn_alert = alert_desc; 114 S3I(ctx->ssl)->warn_alert = alert_desc;
115 return; 115 return;
116 } 116 }
117 117
118 if (alert_desc == SSL_AD_USER_CANCELLED) { 118 if (alert_desc == TLS13_ALERT_USER_CANCELED) {
119 /* 119 /*
120 * We treat this as advisory, since a close_notify alert 120 * We treat this as advisory, since a close_notify alert
121 * SHOULD follow this alert (RFC 8446 section 6.1). 121 * SHOULD follow this alert (RFC 8446 section 6.1).
@@ -176,12 +176,12 @@ tls13_legacy_ocsp_status_recv_cb(void *arg)
176 ret = s->ctx->internal->tlsext_status_cb(s, 176 ret = s->ctx->internal->tlsext_status_cb(s,
177 s->ctx->internal->tlsext_status_arg); 177 s->ctx->internal->tlsext_status_arg);
178 if (ret < 0) { 178 if (ret < 0) {
179 ctx->alert = SSL_AD_INTERNAL_ERROR; 179 ctx->alert = TLS13_ALERT_INTERNAL_ERROR;
180 SSLerror(s, ERR_R_MALLOC_FAILURE); 180 SSLerror(s, ERR_R_MALLOC_FAILURE);
181 return 0; 181 return 0;
182 } 182 }
183 if (ret == 0) { 183 if (ret == 0) {
184 ctx->alert = SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE; 184 ctx->alert = TLS13_ALERT_BAD_CERTIFICATE_STATUS_RESPONSE;
185 SSLerror(s, SSL_R_INVALID_STATUS_RESPONSE); 185 SSLerror(s, SSL_R_INVALID_STATUS_RESPONSE);
186 return 0; 186 return 0;
187 } 187 }
@@ -296,7 +296,7 @@ tls13_phh_received_cb(void *cb_arg, CBS *cbs)
296 CBS phh_cbs; 296 CBS phh_cbs;
297 297
298 if (!tls13_phh_limit_check(ctx)) 298 if (!tls13_phh_limit_check(ctx))
299 return tls13_send_alert(ctx->rl, SSL3_AD_UNEXPECTED_MESSAGE); 299 return tls13_send_alert(ctx->rl, TLS13_ALERT_UNEXPECTED_MESSAGE);
300 300
301 if ((ctx->hs_msg == NULL) && 301 if ((ctx->hs_msg == NULL) &&
302 ((ctx->hs_msg = tls13_handshake_msg_new()) == NULL)) 302 ((ctx->hs_msg = tls13_handshake_msg_new()) == NULL))