2 files changed, 20 insertions, 23 deletions

diff --git a/src/regress/lib/libssl/client/Makefile b/src/regress/lib/libssl/client/Makefile
index d073056921..7e2d7a3ecf 100644
--- a/src/regress/lib/libssl/client/Makefile
+++ b/src/regress/lib/libssl/client/Makefile
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile,v 1.5 2024/04/22 07:31:54 anton Exp $
+#       $OpenBSD: Makefile,v 1.6 2024/07/20 18:37:38 tb Exp $
 
 PROG=   clienttest
 LDADD=  ${SSL_INT} -lcrypto
@@ -6,7 +6,4 @@ DPADD=	${LIBSSL} ${LIBCRYPTO}
 WARNINGS=       Yes
 CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
 
-# Disable for now for upcoming changes. This needs to be easier to deal with.
-REGRESS_EXPECTED_FAILURES+=run-regress-clienttest
-
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libssl/client/clienttest.c b/src/regress/lib/libssl/client/clienttest.c
index 18cf2d0c95..0c526f38f8 100644
--- a/src/regress/lib/libssl/client/clienttest.c
+++ b/src/regress/lib/libssl/client/clienttest.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: clienttest.c,v 1.43 2024/02/03 15:58:34 beck Exp $ */
+/*      $OpenBSD: clienttest.c,v 1.44 2024/07/20 18:37:38 tb Exp $ */
 /*
  * Copyright (c) 2015 Joel Sing <jsing@openbsd.org>
  *
@@ -36,8 +36,8 @@
 #define TLS13_RANDOM_OFFSET (TLS13_HM_OFFSET + 2)
 #define TLS13_SESSION_OFFSET (TLS13_HM_OFFSET + 34)
 #define TLS13_CIPHER_OFFSET (TLS13_HM_OFFSET + 69)
-#define TLS13_KEY_SHARE_OFFSET (TLS13_HM_OFFSET + 184)
-#define TLS13_ONLY_KEY_SHARE_OFFSET (TLS13_HM_OFFSET + 98)
+#define TLS13_KEY_SHARE_OFFSET (TLS13_HM_OFFSET + 198)
+#define TLS13_ONLY_KEY_SHARE_OFFSET (TLS13_HM_OFFSET + 112)
 
 #define TLS1_3_VERSION_ONLY (TLS1_3_VERSION | 0x10000)
 
@@ -116,9 +116,9 @@ static const uint8_t client_hello_dtls12[] = {
         0xbe, 0x00, 0x45, 0x00, 0x9c, 0x00, 0x3c, 0x00,
         0x2f, 0x00, 0xba, 0x00, 0x41, 0xc0, 0x12, 0xc0,
         0x08, 0x00, 0x16, 0x00, 0x0a, 0x00, 0xff, 0x01,
-        0x00, 0x00, 0x34, 0x00, 0x0b, 0x00, 0x02, 0x01,
-        0x00, 0x00, 0x0a, 0x00, 0x0a, 0x00, 0x08, 0x00,
-        0x1d, 0x00, 0x17, 0x00, 0x18, 0x00, 0x19, 0x00,
+        0x00, 0x00, 0x34, 0x00, 0x0a, 0x00, 0x0a, 0x00,
+        0x08, 0x00, 0x1d, 0x00, 0x17, 0x00, 0x18, 0x00,
+        0x19, 0x00, 0x0b, 0x00, 0x02, 0x01, 0x00, 0x00,
         0x23, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x18, 0x00,
         0x16, 0x08, 0x06, 0x06, 0x01, 0x06, 0x03, 0x08,
         0x05, 0x05, 0x01, 0x05, 0x03, 0x08, 0x04, 0x04,
@@ -225,9 +225,9 @@ static const uint8_t client_hello_tls12[] = {
         0x00, 0xba, 0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07,
         0x00, 0x05, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16,
         0x00, 0x0a, 0x00, 0xff, 0x01, 0x00, 0x00, 0x34,
-        0x00, 0x0b, 0x00, 0x02, 0x01, 0x00, 0x00, 0x0a,
-        0x00, 0x0a, 0x00, 0x08, 0x00, 0x1d, 0x00, 0x17,
-        0x00, 0x18, 0x00, 0x19, 0x00, 0x23, 0x00, 0x00,
+        0x00, 0x0a, 0x00, 0x0a, 0x00, 0x08, 0x00, 0x1d,
+        0x00, 0x17, 0x00, 0x18, 0x00, 0x19, 0x00, 0x0b,
+        0x00, 0x02, 0x01, 0x00, 0x00, 0x23, 0x00, 0x00,
         0x00, 0x0d, 0x00, 0x18, 0x00, 0x16, 0x08, 0x06,
         0x06, 0x01, 0x06, 0x03, 0x08, 0x05, 0x05, 0x01,
         0x05, 0x03, 0x08, 0x04, 0x04, 0x01, 0x04, 0x03,
@@ -288,14 +288,14 @@ static const uint8_t client_hello_tls13[] = {
         0x00, 0x05, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16,
         0x00, 0x0a, 0x01, 0x00, 0x00, 0x67, 0x00, 0x2b,
         0x00, 0x05, 0x04, 0x03, 0x04, 0x03, 0x03, 0x00,
-        0x33, 0x00, 0x26, 0x00, 0x24, 0x00, 0x1d, 0x00,
-        0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x0a, 0x00, 0x0a, 0x00, 0x08, 0x00, 0x1d, 0x00,
+        0x17, 0x00, 0x18, 0x00, 0x19, 0x00, 0x33, 0x00,
+        0x26, 0x00, 0x24, 0x00, 0x1d, 0x00, 0x20, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x0b, 0x00, 0x02, 0x01, 0x00, 0x00,
-        0x0a, 0x00, 0x0a, 0x00, 0x08, 0x00, 0x1d, 0x00,
-        0x17, 0x00, 0x18, 0x00, 0x19, 0x00, 0x23, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x0b, 0x00, 0x02, 0x01, 0x00, 0x00, 0x23, 0x00,
         0x00, 0x00, 0x0d, 0x00, 0x18, 0x00, 0x16, 0x08,
         0x06, 0x06, 0x01, 0x06, 0x03, 0x08, 0x05, 0x05,
         0x01, 0x05, 0x03, 0x08, 0x04, 0x04, 0x01, 0x04,
@@ -323,14 +323,14 @@ static const uint8_t client_hello_tls13_only[] = {
         0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x13, 0x03,
         0x13, 0x02, 0x13, 0x01, 0x00, 0xff, 0x01, 0x00,
         0x00, 0x61, 0x00, 0x2b, 0x00, 0x03, 0x02, 0x03,
-        0x04, 0x00, 0x33, 0x00, 0x26, 0x00, 0x24, 0x00,
-        0x1d, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x04, 0x00, 0x0a, 0x00, 0x0a, 0x00, 0x08, 0x00,
+        0x1d, 0x00, 0x17, 0x00, 0x18, 0x00, 0x19, 0x00,
+        0x33, 0x00, 0x26, 0x00, 0x24, 0x00, 0x1d, 0x00,
+        0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x02, 0x01,
-        0x00, 0x00, 0x0a, 0x00, 0x0a, 0x00, 0x08, 0x00,
-        0x1d, 0x00, 0x17, 0x00, 0x18, 0x00, 0x19, 0x00,
+        0x00, 0x00, 0x0b, 0x00, 0x02, 0x01, 0x00, 0x00,
         0x23, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x14, 0x00,
         0x12, 0x08, 0x06, 0x06, 0x01, 0x06, 0x03, 0x08,
         0x05, 0x05, 0x01, 0x05, 0x03, 0x08, 0x04, 0x04,