diff options
Diffstat (limited to 'src/regress/lib/libssl')
-rw-r--r-- | src/regress/lib/libssl/client/clienttest.c | 31 | ||||
-rw-r--r-- | src/regress/lib/libssl/tlsext/tlsexttest.c | 22 |
2 files changed, 25 insertions, 28 deletions
diff --git a/src/regress/lib/libssl/client/clienttest.c b/src/regress/lib/libssl/client/clienttest.c index 25a8790e61..cb45dc583c 100644 --- a/src/regress/lib/libssl/client/clienttest.c +++ b/src/regress/lib/libssl/client/clienttest.c | |||
@@ -141,15 +141,15 @@ static unsigned char cipher_list_tls12_chacha[] = { | |||
141 | }; | 141 | }; |
142 | 142 | ||
143 | static unsigned char client_hello_tls12[] = { | 143 | static unsigned char client_hello_tls12[] = { |
144 | 0x16, 0x03, 0x01, 0x00, 0xc5, 0x01, 0x00, 0x00, | 144 | 0x16, 0x03, 0x01, 0x00, 0xbf, 0x01, 0x00, 0x00, |
145 | 0xc1, 0x03, 0x03, 0xc9, 0xf9, 0x1f, 0x05, 0xaf, | 145 | 0xbb, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, |
146 | 0x61, 0xd7, 0xe7, 0x84, 0xd1, 0x1c, 0x6f, 0x79, | 146 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
147 | 0x32, 0x04, 0x8e, 0x5c, 0xe3, 0x18, 0x5a, 0x85, | 147 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
148 | 0xee, 0x44, 0xe1, 0xca, 0x32, 0xce, 0x07, 0xd3, | 148 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
149 | 0xdb, 0x0f, 0x91, 0x00, 0x00, 0x5c, 0xc0, 0x30, | 149 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c, 0xcc, 0xa9, |
150 | 0xc0, 0x2c, 0xc0, 0x28, 0xc0, 0x24, 0xc0, 0x14, | 150 | 0xcc, 0xa8, 0xcc, 0xaa, 0xc0, 0x30, 0xc0, 0x2c, |
151 | 0xc0, 0x0a, 0x00, 0x9f, 0x00, 0x6b, 0x00, 0x39, | 151 | 0xc0, 0x28, 0xc0, 0x24, 0xc0, 0x14, 0xc0, 0x0a, |
152 | 0xcc, 0xa9, 0xcc, 0xa8, 0xcc, 0xaa, 0xff, 0x85, | 152 | 0x00, 0x9f, 0x00, 0x6b, 0x00, 0x39, 0xff, 0x85, |
153 | 0x00, 0xc4, 0x00, 0x88, 0x00, 0x81, 0x00, 0x9d, | 153 | 0x00, 0xc4, 0x00, 0x88, 0x00, 0x81, 0x00, 0x9d, |
154 | 0x00, 0x3d, 0x00, 0x35, 0x00, 0xc0, 0x00, 0x84, | 154 | 0x00, 0x3d, 0x00, 0x35, 0x00, 0xc0, 0x00, 0x84, |
155 | 0xc0, 0x2f, 0xc0, 0x2b, 0xc0, 0x27, 0xc0, 0x23, | 155 | 0xc0, 0x2f, 0xc0, 0x2b, 0xc0, 0x27, 0xc0, 0x23, |
@@ -158,15 +158,14 @@ static unsigned char client_hello_tls12[] = { | |||
158 | 0x00, 0x3c, 0x00, 0x2f, 0x00, 0xba, 0x00, 0x41, | 158 | 0x00, 0x3c, 0x00, 0x2f, 0x00, 0xba, 0x00, 0x41, |
159 | 0xc0, 0x11, 0xc0, 0x07, 0x00, 0x05, 0x00, 0x04, | 159 | 0xc0, 0x11, 0xc0, 0x07, 0x00, 0x05, 0x00, 0x04, |
160 | 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16, 0x00, 0x0a, | 160 | 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16, 0x00, 0x0a, |
161 | 0x00, 0xff, 0x01, 0x00, 0x00, 0x3c, 0x00, 0x0b, | 161 | 0x00, 0xff, 0x01, 0x00, 0x00, 0x36, 0x00, 0x0b, |
162 | 0x00, 0x02, 0x01, 0x00, 0x00, 0x0a, 0x00, 0x08, | 162 | 0x00, 0x02, 0x01, 0x00, 0x00, 0x0a, 0x00, 0x08, |
163 | 0x00, 0x06, 0x00, 0x1d, 0x00, 0x17, 0x00, 0x18, | 163 | 0x00, 0x06, 0x00, 0x1d, 0x00, 0x17, 0x00, 0x18, |
164 | 0x00, 0x23, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x22, | 164 | 0x00, 0x23, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x1c, |
165 | 0x00, 0x20, 0x08, 0x06, 0x06, 0x01, 0x06, 0x03, | 165 | 0x00, 0x1a, 0x06, 0x01, 0x06, 0x03, 0xef, 0xef, |
166 | 0xef, 0xef, 0x08, 0x05, 0x05, 0x01, 0x05, 0x03, | 166 | 0x05, 0x01, 0x05, 0x03, 0x04, 0x01, 0x04, 0x03, |
167 | 0x08, 0x04, 0x04, 0x01, 0x04, 0x03, 0xee, 0xee, | 167 | 0xee, 0xee, 0xed, 0xed, 0x03, 0x01, 0x03, 0x03, |
168 | 0xed, 0xed, 0x03, 0x01, 0x03, 0x03, 0x02, 0x01, | 168 | 0x02, 0x01, 0x02, 0x03, |
169 | 0x02, 0x03, | ||
170 | }; | 169 | }; |
171 | 170 | ||
172 | struct client_hello_test { | 171 | struct client_hello_test { |
diff --git a/src/regress/lib/libssl/tlsext/tlsexttest.c b/src/regress/lib/libssl/tlsext/tlsexttest.c index 3387b86f3f..5689a1c29e 100644 --- a/src/regress/lib/libssl/tlsext/tlsexttest.c +++ b/src/regress/lib/libssl/tlsext/tlsexttest.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tlsexttest.c,v 1.23 2019/01/23 16:46:04 beck Exp $ */ | 1 | /* $OpenBSD: tlsexttest.c,v 1.24 2019/01/23 18:24:40 beck Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2017 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2017 Joel Sing <jsing@openbsd.org> |
4 | * Copyright (c) 2017 Doug Hogan <doug@openbsd.org> | 4 | * Copyright (c) 2017 Doug Hogan <doug@openbsd.org> |
@@ -1505,11 +1505,10 @@ test_tlsext_ri_server(void) | |||
1505 | */ | 1505 | */ |
1506 | 1506 | ||
1507 | static unsigned char tlsext_sigalgs_client[] = { | 1507 | static unsigned char tlsext_sigalgs_client[] = { |
1508 | 0x00, 0x20, 0x08, 0x06, 0x06, 0x01, 0x06, 0x03, | 1508 | 0x00, 0x1a, 0x06, 0x01, 0x06, 0x03, 0xef, 0xef, |
1509 | 0xef, 0xef, 0x08, 0x05, 0x05, 0x01, 0x05, 0x03, | 1509 | 0x05, 0x01, 0x05, 0x03, 0x04, 0x01, 0x04, 0x03, |
1510 | 0x08, 0x04, 0x04, 0x01, 0x04, 0x03, 0xee, 0xee, | 1510 | 0xee, 0xee, 0xed, 0xed, 0x03, 0x01, 0x03, 0x03, |
1511 | 0xed, 0xed, 0x03, 0x01, 0x03, 0x03, 0x02, 0x01, | 1511 | 0x02, 0x01, 0x02, 0x03, |
1512 | 0x02, 0x03, | ||
1513 | }; | 1512 | }; |
1514 | 1513 | ||
1515 | static int | 1514 | static int |
@@ -2733,14 +2732,13 @@ test_tlsext_srtp_server(void) | |||
2733 | #endif /* OPENSSL_NO_SRTP */ | 2732 | #endif /* OPENSSL_NO_SRTP */ |
2734 | 2733 | ||
2735 | unsigned char tlsext_clienthello_default[] = { | 2734 | unsigned char tlsext_clienthello_default[] = { |
2736 | 0x00, 0x3c, 0x00, 0x0b, 0x00, 0x02, 0x01, 0x00, | 2735 | 0x00, 0x36, 0x00, 0x0b, 0x00, 0x02, 0x01, 0x00, |
2737 | 0x00, 0x0a, 0x00, 0x08, 0x00, 0x06, 0x00, 0x1d, | 2736 | 0x00, 0x0a, 0x00, 0x08, 0x00, 0x06, 0x00, 0x1d, |
2738 | 0x00, 0x17, 0x00, 0x18, 0x00, 0x23, 0x00, 0x00, | 2737 | 0x00, 0x17, 0x00, 0x18, 0x00, 0x23, 0x00, 0x00, |
2739 | 0x00, 0x0d, 0x00, 0x22, 0x00, 0x20, 0x08, 0x06, | 2738 | 0x00, 0x0d, 0x00, 0x1c, 0x00, 0x1a, 0x06, 0x01, |
2740 | 0x06, 0x01, 0x06, 0x03, 0xef, 0xef, 0x08, 0x05, | 2739 | 0x06, 0x03, 0xef, 0xef, 0x05, 0x01, 0x05, 0x03, |
2741 | 0x05, 0x01, 0x05, 0x03, 0x08, 0x04, 0x04, 0x01, | 2740 | 0x04, 0x01, 0x04, 0x03, 0xee, 0xee, 0xed, 0xed, |
2742 | 0x04, 0x03, 0xee, 0xee, 0xed, 0xed, 0x03, 0x01, | 2741 | 0x03, 0x01, 0x03, 0x03, 0x02, 0x01, 0x02, 0x03, |
2743 | 0x03, 0x03, 0x02, 0x01, 0x02, 0x03, | ||
2744 | }; | 2742 | }; |
2745 | 2743 | ||
2746 | unsigned char tlsext_clienthello_disabled[] = {}; | 2744 | unsigned char tlsext_clienthello_disabled[] = {}; |