summaryrefslogtreecommitdiff
path: root/src/lib/libtls
diff options
context:
space:
mode:
authorsthen <>2026-06-06 16:23:30 +0000
committersthen <>2026-06-06 16:23:30 +0000
commit8cdf88a77937b647688dbbbe0a418cc23fa8e1cd (patch)
treeb1b3710dcd27f22f2472e48d8198cf813fcff92a /src/lib/libtls
parentb58b2de9589eccdf473227aee5cb374998f0bf08 (diff)
downloadopenbsd-8cdf88a77937b647688dbbbe0a418cc23fa8e1cd.tar.gz
openbsd-8cdf88a77937b647688dbbbe0a418cc23fa8e1cd.tar.bz2
openbsd-8cdf88a77937b647688dbbbe0a418cc23fa8e1cd.zip
add X25519MLKEM768 to the start of the default ECDHE curves list, allowing
libtls clients to connect to servers which don't offer any other curves (this has been seen in the wild with got, reported by stsp). ok tb@ depends on recent libssl changes (ssl_tlsext.c r1.161, t1_lib.c r1.209).
Diffstat (limited to 'src/lib/libtls')
-rw-r--r--src/lib/libtls/man/tls_config_set_protocols.38
-rw-r--r--src/lib/libtls/tls_internal.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libtls/man/tls_config_set_protocols.3 b/src/lib/libtls/man/tls_config_set_protocols.3
index 403bc10b82..b9ef27ee6a 100644
--- a/src/lib/libtls/man/tls_config_set_protocols.3
+++ b/src/lib/libtls/man/tls_config_set_protocols.3
@@ -1,4 +1,4 @@
1.\" $OpenBSD: tls_config_set_protocols.3,v 1.13 2025/07/07 10:54:00 schwarze Exp $ 1.\" $OpenBSD: tls_config_set_protocols.3,v 1.14 2026/06/06 16:23:30 sthen Exp $
2.\" 2.\"
3.\" Copyright (c) 2014 Ted Unangst <tedu@openbsd.org> 3.\" Copyright (c) 2014 Ted Unangst <tedu@openbsd.org>
4.\" Copyright (c) 2015, 2016 Joel Sing <jsing@openbsd.org> 4.\" Copyright (c) 2015, 2016 Joel Sing <jsing@openbsd.org>
@@ -16,7 +16,7 @@
16.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 16.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
17.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 17.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
18.\" 18.\"
19.Dd $Mdocdate: July 7 2025 $ 19.Dd $Mdocdate: June 6 2026 $
20.Dt TLS_CONFIG_SET_PROTOCOLS 3 20.Dt TLS_CONFIG_SET_PROTOCOLS 3
21.Os 21.Os
22.Sh NAME 22.Sh NAME
@@ -174,8 +174,8 @@ which disables DHE key exchange.
174specifies the names of the elliptic curves that may be used during Elliptic 174specifies the names of the elliptic curves that may be used during Elliptic
175Curve Diffie-Hellman Ephemeral (ECDHE) key exchange. 175Curve Diffie-Hellman Ephemeral (ECDHE) key exchange.
176This is a comma separated list, given in order of preference. 176This is a comma separated list, given in order of preference.
177The special value of "default" will use the default curves (currently X25519, 177The special value of "default" will use the default curves (currently
178P-256 and P-384). 178X25519MLKEM768, X25519, P-256 and P-384).
179This function replaces 179This function replaces
180.Fn tls_config_set_ecdhecurve , 180.Fn tls_config_set_ecdhecurve ,
181which is deprecated. 181which is deprecated.
diff --git a/src/lib/libtls/tls_internal.h b/src/lib/libtls/tls_internal.h
index 8e566a34e0..434efc196a 100644
--- a/src/lib/libtls/tls_internal.h
+++ b/src/lib/libtls/tls_internal.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls_internal.h,v 1.86 2024/12/10 08:40:30 tb Exp $ */ 1/* $OpenBSD: tls_internal.h,v 1.87 2026/06/06 16:23:30 sthen Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Jeremie Courreges-Anglas <jca@openbsd.org> 3 * Copyright (c) 2014 Jeremie Courreges-Anglas <jca@openbsd.org>
4 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> 4 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
@@ -37,7 +37,7 @@ __BEGIN_HIDDEN_DECLS
37#define TLS_CIPHERS_LEGACY "HIGH:MEDIUM:!aNULL" 37#define TLS_CIPHERS_LEGACY "HIGH:MEDIUM:!aNULL"
38#define TLS_CIPHERS_ALL "ALL:!aNULL:!eNULL" 38#define TLS_CIPHERS_ALL "ALL:!aNULL:!eNULL"
39 39
40#define TLS_ECDHE_CURVES "X25519,P-256,P-384" 40#define TLS_ECDHE_CURVES "X25519MLKEM768,X25519,P-256,P-384"
41 41
42union tls_addr { 42union tls_addr {
43 struct in_addr ip4; 43 struct in_addr ip4;