diff --git a/regress/lib/libssl/client/clienttest.c b/regress/lib/libssl/client/clienttest.c index f9258105f81..ddbc43c61a5 100644 --- a/regress/lib/libssl/client/clienttest.c +++ b/regress/lib/libssl/client/clienttest.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clienttest.c,v 1.46 2025/12/04 21:16:17 beck Exp $ */ +/* $OpenBSD: clienttest.c,v 1.47 2026/03/30 06:23:33 tb Exp $ */ /* * Copyright (c) 2015 Joel Sing * @@ -99,9 +99,9 @@ static const uint8_t cipher_list_dtls12_chacha[] = { static const uint8_t client_hello_dtls12[] = { 0x16, 0xfe, 0xfd, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xba, 0x01, 0x00, 0x00, - 0xae, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xae, 0xfe, 0xfd, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, + 0xb4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xb4, 0xfe, 0xfd, 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, @@ -116,13 +116,14 @@ 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, 0x0a, 0x00, 0x0a, 0x00, + 0x00, 0x00, 0x3a, 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, 0x02, 0x01, 0x02, 0x03, + 0x23, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x1e, 0x00, + 0x1c, 0x08, 0x06, 0x08, 0x0b, 0x06, 0x01, 0x06, + 0x03, 0x08, 0x05, 0x08, 0x0a, 0x05, 0x01, 0x05, + 0x03, 0x08, 0x04, 0x08, 0x09, 0x04, 0x01, 0x04, + 0x03, 0x02, 0x01, 0x02, 0x03, }; static const uint8_t cipher_list_tls10[] = { @@ -208,8 +209,8 @@ static const uint8_t cipher_list_tls12_chacha[] = { }; static const uint8_t client_hello_tls12[] = { - 0x16, 0x03, 0x03, 0x00, 0xb7, 0x01, 0x00, 0x00, - 0xb3, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x16, 0x03, 0x03, 0x00, 0xbd, 0x01, 0x00, 0x00, + 0xb9, 0x03, 0x03, 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, @@ -224,14 +225,15 @@ static const uint8_t client_hello_tls12[] = { 0x00, 0x45, 0x00, 0x9c, 0x00, 0x3c, 0x00, 0x2f, 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, 0x0a, 0x00, 0xff, 0x01, 0x00, 0x00, 0x3a, 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, - 0x02, 0x01, 0x02, 0x03, + 0x00, 0x0d, 0x00, 0x1e, 0x00, 0x1c, 0x08, 0x06, + 0x08, 0x0b, 0x06, 0x01, 0x06, 0x03, 0x08, 0x05, + 0x08, 0x0a, 0x05, 0x01, 0x05, 0x03, 0x08, 0x04, + 0x08, 0x09, 0x04, 0x01, 0x04, 0x03, 0x02, 0x01, + 0x02, 0x03, }; static const uint8_t cipher_list_tls13_aes[] = { @@ -265,8 +267,8 @@ static const uint8_t cipher_list_tls13_chacha[] = { }; static const uint8_t client_hello_tls13[] = { - 0x16, 0x03, 0x03, 0x05, 0xd6, 0x01, 0x00, 0x05, - 0xd2, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x16, 0x03, 0x03, 0x05, 0xdc, 0x01, 0x00, 0x05, + 0xd8, 0x03, 0x03, 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, @@ -286,7 +288,7 @@ static const uint8_t client_hello_tls13[] = { 0x00, 0x45, 0x00, 0x9c, 0x00, 0x3c, 0x00, 0x2f, 0x00, 0xba, 0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07, 0x00, 0x05, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16, - 0x00, 0x0a, 0x01, 0x00, 0x05, 0x2d, 0x00, 0x2b, + 0x00, 0x0a, 0x01, 0x00, 0x05, 0x33, 0x00, 0x2b, 0x00, 0x05, 0x04, 0x03, 0x04, 0x03, 0x03, 0x00, 0x0a, 0x00, 0x0c, 0x00, 0x0a, 0x11, 0xec, 0x00, 0x1d, 0x00, 0x17, 0x00, 0x18, 0x00, 0x19, 0x00, @@ -449,10 +451,11 @@ static const uint8_t client_hello_tls13[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x03, 0x02, - 0x01, 0x02, 0x03, + 0x0d, 0x00, 0x1e, 0x00, 0x1c, 0x08, 0x06, 0x08, + 0x0b, 0x06, 0x01, 0x06, 0x03, 0x08, 0x05, 0x08, + 0x0a, 0x05, 0x01, 0x05, 0x03, 0x08, 0x04, 0x08, + 0x09, 0x04, 0x01, 0x04, 0x03, 0x02, 0x01, 0x02, + 0x03, }; static const uint8_t cipher_list_tls13_only_aes[] = { @@ -464,8 +467,8 @@ static const uint8_t cipher_list_tls13_only_chacha[] = { }; static const uint8_t client_hello_tls13_only[] = { - 0x16, 0x03, 0x03, 0x05, 0x7c, 0x01, 0x00, 0x05, - 0x78, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x16, 0x03, 0x03, 0x05, 0x82, 0x01, 0x00, 0x05, + 0x7e, 0x03, 0x03, 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, @@ -475,7 +478,7 @@ static const uint8_t client_hello_tls13_only[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x13, 0x03, 0x13, 0x02, 0x13, 0x01, 0x00, 0xff, 0x01, 0x00, - 0x05, 0x27, 0x00, 0x2b, 0x00, 0x03, 0x02, 0x03, + 0x05, 0x2d, 0x00, 0x2b, 0x00, 0x03, 0x02, 0x03, 0x04, 0x00, 0x0a, 0x00, 0x0c, 0x00, 0x0a, 0x11, 0xec, 0x00, 0x1d, 0x00, 0x17, 0x00, 0x18, 0x00, 0x19, 0x00, 0x33, 0x04, 0xea, 0x04, 0xe8, 0x11, @@ -637,10 +640,10 @@ static const uint8_t client_hello_tls13_only[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x01, 0x04, - 0x03, + 0x00, 0x00, 0x0d, 0x00, 0x1a, 0x00, 0x18, 0x08, + 0x06, 0x08, 0x0b, 0x06, 0x01, 0x06, 0x03, 0x08, + 0x05, 0x08, 0x0a, 0x05, 0x01, 0x05, 0x03, 0x08, + 0x04, 0x08, 0x09, 0x04, 0x01, 0x04, 0x03, }; struct client_hello_test { diff --git a/regress/lib/libssl/tlsext/tlsexttest.c b/regress/lib/libssl/tlsext/tlsexttest.c index 4c3701a63d6..7a329756292 100644 --- a/regress/lib/libssl/tlsext/tlsexttest.c +++ b/regress/lib/libssl/tlsext/tlsexttest.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tlsexttest.c,v 1.95 2025/12/04 21:03:42 beck Exp $ */ +/* $OpenBSD: tlsexttest.c,v 1.96 2026/03/30 06:23:33 tb Exp $ */ /* * Copyright (c) 2017 Joel Sing * Copyright (c) 2017 Doug Hogan @@ -1608,9 +1608,10 @@ test_tlsext_ri_server(void) */ static const unsigned char tlsext_sigalgs_client[] = { - 0x00, 0x16, 0x08, 0x06, 0x06, 0x01, 0x06, 0x03, - 0x08, 0x05, 0x05, 0x01, 0x05, 0x03, 0x08, 0x04, - 0x04, 0x01, 0x04, 0x03, 0x02, 0x01, 0x02, 0x03, + 0x00, 0x1c, 0x08, 0x06, 0x08, 0x0b, 0x06, 0x01, + 0x06, 0x03, 0x08, 0x05, 0x08, 0x0a, 0x05, 0x01, + 0x05, 0x03, 0x08, 0x04, 0x08, 0x09, 0x04, 0x01, + 0x04, 0x03, 0x02, 0x01, 0x02, 0x03, }; static int @@ -3186,13 +3187,14 @@ test_tlsext_srtp_server(void) #endif /* OPENSSL_NO_SRTP */ static const unsigned char tlsext_clienthello_default[] = { - 0x00, 0x34, 0x00, 0x0a, 0x00, 0x0a, 0x00, 0x08, + 0x00, 0x3a, 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, 0x02, 0x01, 0x02, 0x03, + 0x00, 0x00, 0x00, 0x0d, 0x00, 0x1e, 0x00, 0x1c, + 0x08, 0x06, 0x08, 0x0b, 0x06, 0x01, 0x06, 0x03, + 0x08, 0x05, 0x08, 0x0a, 0x05, 0x01, 0x05, 0x03, + 0x08, 0x04, 0x08, 0x09, 0x04, 0x01, 0x04, 0x03, + 0x02, 0x01, 0x02, 0x03, }; /* An empty array is an incomplete type and sizeof() is undefined. */