summaryrefslogtreecommitdiff
path: root/src/lib/libssl/tls_key_share.c
diff options
context:
space:
mode:
authortb <>2026-06-08 11:38:04 +0000
committertb <>2026-06-08 11:38:04 +0000
commitbaa9a5c738f68f3c75ae79a408cabd4e9ea2d12c (patch)
treee3b4a1d8acc0622b9493cd5322db2774b4e8e3af /src/lib/libssl/tls_key_share.c
parent1091a3721fde40f0f1c76e8cef8455c495204356 (diff)
downloadopenbsd-baa9a5c738f68f3c75ae79a408cabd4e9ea2d12c.tar.gz
openbsd-baa9a5c738f68f3c75ae79a408cabd4e9ea2d12c.tar.bz2
openbsd-baa9a5c738f68f3c75ae79a408cabd4e9ea2d12c.zip
Add a decode_error argument to ssl_kex_peer_public_ecdhe_ecp()
ok jsing kenjiro
Diffstat (limited to 'src/lib/libssl/tls_key_share.c')
-rw-r--r--src/lib/libssl/tls_key_share.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/libssl/tls_key_share.c b/src/lib/libssl/tls_key_share.c
index 48b353d318..adaf147584 100644
--- a/src/lib/libssl/tls_key_share.c
+++ b/src/lib/libssl/tls_key_share.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls_key_share.c,v 1.11 2026/05/06 15:02:51 jsing Exp $ */ 1/* $OpenBSD: tls_key_share.c,v 1.12 2026/06/08 11:38:04 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2020, 2021 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2020, 2021 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -491,7 +491,8 @@ tls_key_share_peer_public_dhe(struct tls_key_share *ks, CBS *cbs,
491} 491}
492 492
493static int 493static int
494tls_key_share_peer_public_ecdhe_ecp(struct tls_key_share *ks, CBS *cbs) 494tls_key_share_peer_public_ecdhe_ecp(struct tls_key_share *ks, CBS *cbs,
495 int *decode_error)
495{ 496{
496 EC_KEY *ecdhe = NULL; 497 EC_KEY *ecdhe = NULL;
497 int ret = 0; 498 int ret = 0;
@@ -501,7 +502,7 @@ tls_key_share_peer_public_ecdhe_ecp(struct tls_key_share *ks, CBS *cbs)
501 502
502 if ((ecdhe = EC_KEY_new()) == NULL) 503 if ((ecdhe = EC_KEY_new()) == NULL)
503 goto err; 504 goto err;
504 if (!ssl_kex_peer_public_ecdhe_ecp(ecdhe, ks->nid, cbs)) 505 if (!ssl_kex_peer_public_ecdhe_ecp(ecdhe, ks->nid, cbs, decode_error))
505 goto err; 506 goto err;
506 507
507 ks->ecdhe_peer = ecdhe; 508 ks->ecdhe_peer = ecdhe;
@@ -625,7 +626,7 @@ tls_key_share_peer_public(struct tls_key_share *ks, CBS *cbs, int *decode_error,
625 if (ks->nid == NID_X25519) 626 if (ks->nid == NID_X25519)
626 return tls_key_share_peer_public_x25519(ks, cbs, decode_error); 627 return tls_key_share_peer_public_x25519(ks, cbs, decode_error);
627 628
628 return tls_key_share_peer_public_ecdhe_ecp(ks, cbs); 629 return tls_key_share_peer_public_ecdhe_ecp(ks, cbs, decode_error);
629} 630}
630 631
631/* Called from client to process a server peer */ 632/* Called from client to process a server peer */