summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_local.h
diff options
context:
space:
mode:
authorbeck <>2025-12-04 21:16:17 +0000
committerbeck <>2025-12-04 21:16:17 +0000
commitdccd1f43a0c2de3852d9515f57353d756629c97a (patch)
tree7ffb1e1927c856374b227b21ca57105f14121045 /src/lib/libssl/ssl_local.h
parentf8fcf556caab3fb1fb9d9b496d2724345c90a3eb (diff)
downloadopenbsd-dccd1f43a0c2de3852d9515f57353d756629c97a.tar.gz
openbsd-dccd1f43a0c2de3852d9515f57353d756629c97a.tar.bz2
openbsd-dccd1f43a0c2de3852d9515f57353d756629c97a.zip
Hook up X25519MKLEM768 to the TLS 1.3 handshake
This does the following: 1) Adds a second key share prediction to the TLS 1.3 handshake. We only add one as we are unlikely to want to send more than one PQ one, and one classical one and are unlikely to waste bytes on a second PQ algorithm (anything that wants something else that we support can HRR to get it) 2) Adds X25519MLKEM768 (4588) to our list of supported groups. We add this to our preferred client and server key shares for TLS 1.3 and we now have a separate list for TLS 1.2 which does not do this, cleaning up the old "full list" from the comments. 3) Updates the golden magic numbers in the regression tests to allow for the above two things changing the handshake, so the regress tests pass. With this you can successfully hybrid PQ with servers and clients that support it. ok tb@ kenjiro@
Diffstat (limited to 'src/lib/libssl/ssl_local.h')
-rw-r--r--src/lib/libssl/ssl_local.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl_local.h b/src/lib/libssl/ssl_local.h
index 9921c3a730..7942c36dbd 100644
--- a/src/lib/libssl/ssl_local.h
+++ b/src/lib/libssl/ssl_local.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_local.h,v 1.34 2025/10/24 09:23:06 tb Exp $ */ 1/* $OpenBSD: ssl_local.h,v 1.35 2025/12/04 21:16:17 beck Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -490,6 +490,9 @@ typedef struct ssl_handshake_tls13_st {
490 /* Certificate selected for use (static pointer). */ 490 /* Certificate selected for use (static pointer). */
491 const SSL_CERT_PKEY *cpk; 491 const SSL_CERT_PKEY *cpk;
492 492
493 /* Client's extra predicted key share */
494 struct tls_key_share *key_share;
495
493 /* Version proposed by peer server. */ 496 /* Version proposed by peer server. */
494 uint16_t server_version; 497 uint16_t server_version;
495 498