summaryrefslogtreecommitdiff
path: root/src/lib/libssl/tls13_server.c
diff options
context:
space:
mode:
authortb <>2022-07-02 16:00:12 +0000
committertb <>2022-07-02 16:00:12 +0000
commitf7fed9455632a5807e76bd3a28879f5a87857c53 (patch)
tree9d374c62eeff973ee0b7721a87b5f66c56832f1e /src/lib/libssl/tls13_server.c
parentc757fe9bb6c16f47a415034b69dda698116160ba (diff)
downloadopenbsd-f7fed9455632a5807e76bd3a28879f5a87857c53.tar.gz
openbsd-f7fed9455632a5807e76bd3a28879f5a87857c53.tar.bz2
openbsd-f7fed9455632a5807e76bd3a28879f5a87857c53.zip
Rename uses 'curve' to 'group' and rework tls1 group API.
This reworks various tls1_ curve APIs to indicate success via a boolean return value and move the output to an out parameter. This makes the caller code easier and more consistent. Based on a suggestion by jsing ok jsing
Diffstat (limited to 'src/lib/libssl/tls13_server.c')
-rw-r--r--src/lib/libssl/tls13_server.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/tls13_server.c b/src/lib/libssl/tls13_server.c
index 2c1c12ff25..c5c86ab95f 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.98 2022/06/04 01:14:43 tb Exp $ */ 1/* $OpenBSD: tls13_server.c,v 1.99 2022/07/02 16:00:12 tb 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>
@@ -432,9 +432,9 @@ tls13_server_hello_retry_request_send(struct tls13_ctx *ctx, CBB *cbb)
432 432
433 if (ctx->hs->key_share != NULL) 433 if (ctx->hs->key_share != NULL)
434 return 0; 434 return 0;
435 if ((nid = tls1_get_shared_curve(ctx->ssl)) == NID_undef) 435 if (!tls1_get_supported_group(ctx->ssl, &nid))
436 return 0; 436 return 0;
437 if ((ctx->hs->tls13.server_group = tls1_ec_nid2curve_id(nid)) == 0) 437 if (!tls1_ec_nid2group_id(nid, &ctx->hs->tls13.server_group))
438 return 0; 438 return 0;
439 439
440 if (!tls13_server_hello_build(ctx, cbb, 1)) 440 if (!tls13_server_hello_build(ctx, cbb, 1))