summaryrefslogtreecommitdiff
path: root/src/lib/libssl/tls13_server.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/lib/libssl/tls13_server.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libssl/tls13_server.c b/src/lib/libssl/tls13_server.c
index f5066f958a..739ef06609 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.89 2021/12/26 14:59:52 jsing Exp $ */ 1/* $OpenBSD: tls13_server.c,v 1.90 2022/01/05 17:10:02 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>
@@ -295,7 +295,7 @@ tls13_client_hello_recv(struct tls13_ctx *ctx, CBS *cbs)
295 * has been enabled. This would probably mean using either an 295 * has been enabled. This would probably mean using either an
296 * INITIAL | WITHOUT_HRR state, or another intermediate state. 296 * INITIAL | WITHOUT_HRR state, or another intermediate state.
297 */ 297 */
298 if (ctx->hs->tls13.key_share != NULL) 298 if (ctx->hs->key_share != NULL)
299 ctx->handshake_stage.hs_type |= NEGOTIATED | WITHOUT_HRR; 299 ctx->handshake_stage.hs_type |= NEGOTIATED | WITHOUT_HRR;
300 300
301 /* XXX - check this is the correct point */ 301 /* XXX - check this is the correct point */
@@ -360,7 +360,7 @@ tls13_server_engage_record_protection(struct tls13_ctx *ctx)
360 SSL *s = ctx->ssl; 360 SSL *s = ctx->ssl;
361 int ret = 0; 361 int ret = 0;
362 362
363 if (!tls13_key_share_derive(ctx->hs->tls13.key_share, 363 if (!tls_key_share_derive(ctx->hs->key_share,
364 &shared_key, &shared_key_len)) 364 &shared_key, &shared_key_len))
365 goto err; 365 goto err;
366 366
@@ -425,7 +425,7 @@ tls13_server_hello_retry_request_send(struct tls13_ctx *ctx, CBB *cbb)
425 if (!tls13_synthetic_handshake_message(ctx)) 425 if (!tls13_synthetic_handshake_message(ctx))
426 return 0; 426 return 0;
427 427
428 if (ctx->hs->tls13.key_share != NULL) 428 if (ctx->hs->key_share != NULL)
429 return 0; 429 return 0;
430 if ((nid = tls1_get_shared_curve(ctx->ssl)) == NID_undef) 430 if ((nid = tls1_get_shared_curve(ctx->ssl)) == NID_undef)
431 return 0; 431 return 0;
@@ -485,9 +485,9 @@ tls13_servername_process(struct tls13_ctx *ctx)
485int 485int
486tls13_server_hello_send(struct tls13_ctx *ctx, CBB *cbb) 486tls13_server_hello_send(struct tls13_ctx *ctx, CBB *cbb)
487{ 487{
488 if (ctx->hs->tls13.key_share == NULL) 488 if (ctx->hs->key_share == NULL)
489 return 0; 489 return 0;
490 if (!tls13_key_share_generate(ctx->hs->tls13.key_share)) 490 if (!tls_key_share_generate(ctx->hs->key_share))
491 return 0; 491 return 0;
492 if (!tls13_servername_process(ctx)) 492 if (!tls13_servername_process(ctx))
493 return 0; 493 return 0;