summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2017-01-24 09:06:00 +0000
committerjsing <>2017-01-24 09:06:00 +0000
commit962f320e2a051d86474c82acaaff7f14ecf8d039 (patch)
tree13a7122c50072fac250fadd3ab979f6cf03aca0e
parent71cc331549d24c7e6a825b6aa26d8c8064dfe01a (diff)
downloadopenbsd-962f320e2a051d86474c82acaaff7f14ecf8d039.tar.gz
openbsd-962f320e2a051d86474c82acaaff7f14ecf8d039.tar.bz2
openbsd-962f320e2a051d86474c82acaaff7f14ecf8d039.zip
Update client tests for changes in default EC formats/curves.
Diffstat
-rw-r--r--src/regress/lib/libssl/client/clienttest.c83
1 files changed, 31 insertions, 52 deletions
diff --git a/src/regress/lib/libssl/client/clienttest.c b/src/regress/lib/libssl/client/clienttest.c
index b61308d3a9..03c5a7c571 100644
--- a/src/regress/lib/libssl/client/clienttest.c
+++ b/src/regress/lib/libssl/client/clienttest.c
@@ -72,12 +72,12 @@ static unsigned char cipher_list_tls10[] = {
72}; 72};
73 73
74static unsigned char client_hello_tls10[] = { 74static unsigned char client_hello_tls10[] = {
75 0x16, 0x03, 0x01, 0x00, 0xb7, 0x01, 0x00, 0x00, 75 0x16, 0x03, 0x01, 0x00, 0x81, 0x01, 0x00, 0x00,
76 0xb3, 0x03, 0x01, 0x06, 0x6a, 0x3f, 0x0f, 0xf5, 76 0x7d, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
77 0x19, 0x64, 0x2d, 0xfd, 0xb1, 0x4a, 0x91, 0xcd, 77 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
78 0x65, 0x37, 0xf8, 0x51, 0x92, 0xf9, 0xbf, 0xe9, 78 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
79 0x46, 0x41, 0x2e, 0x0a, 0x4d, 0xb1, 0xa8, 0x0c, 79 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
80 0x88, 0xec, 0x03, 0x00, 0x00, 0x3e, 0xc0, 0x14, 80 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0xc0, 0x14,
81 0xc0, 0x0a, 0x00, 0x39, 0x00, 0x38, 0xff, 0x85, 81 0xc0, 0x0a, 0x00, 0x39, 0x00, 0x38, 0xff, 0x85,
82 0x00, 0x88, 0x00, 0x87, 0x00, 0x81, 0x00, 0x35, 82 0x00, 0x88, 0x00, 0x87, 0x00, 0x81, 0x00, 0x35,
83 0x00, 0x84, 0xc0, 0x13, 0xc0, 0x09, 0x00, 0x33, 83 0x00, 0x84, 0xc0, 0x13, 0xc0, 0x09, 0x00, 0x33,
@@ -85,17 +85,10 @@ static unsigned char client_hello_tls10[] = {
85 0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07, 0x00, 0x05, 85 0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07, 0x00, 0x05,
86 0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16, 86 0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16,
87 0x00, 0x13, 0x00, 0x0a, 0x00, 0x15, 0x00, 0x12, 87 0x00, 0x13, 0x00, 0x0a, 0x00, 0x15, 0x00, 0x12,
88 0x00, 0x09, 0x00, 0xff, 0x01, 0x00, 0x00, 0x4c, 88 0x00, 0x09, 0x00, 0xff, 0x01, 0x00, 0x00, 0x16,
89 0x00, 0x0b, 0x00, 0x04, 0x03, 0x00, 0x01, 0x02, 89 0x00, 0x0b, 0x00, 0x02, 0x01, 0x00, 0x00, 0x0a,
90 0x00, 0x0a, 0x00, 0x3c, 0x00, 0x3a, 0x00, 0x1d, 90 0x00, 0x08, 0x00, 0x06, 0x00, 0x1d, 0x00, 0x17,
91 0x00, 0x0e, 0x00, 0x0d, 0x00, 0x19, 0x00, 0x1c, 91 0x00, 0x18, 0x00, 0x23, 0x00, 0x00,
92 0x00, 0x0b, 0x00, 0x0c, 0x00, 0x1b, 0x00, 0x18,
93 0x00, 0x09, 0x00, 0x0a, 0x00, 0x1a, 0x00, 0x16,
94 0x00, 0x17, 0x00, 0x08, 0x00, 0x06, 0x00, 0x07,
95 0x00, 0x14, 0x00, 0x15, 0x00, 0x04, 0x00, 0x05,
96 0x00, 0x12, 0x00, 0x13, 0x00, 0x01, 0x00, 0x02,
97 0x00, 0x03, 0x00, 0x0f, 0x00, 0x10, 0x00, 0x11,
98 0x00, 0x23, 0x00, 0x00,
99}; 92};
100 93
101static unsigned char cipher_list_tls11[] = { 94static unsigned char cipher_list_tls11[] = {
@@ -110,12 +103,12 @@ static unsigned char cipher_list_tls11[] = {
110}; 103};
111 104
112static unsigned char client_hello_tls11[] = { 105static unsigned char client_hello_tls11[] = {
113 0x16, 0x03, 0x01, 0x00, 0xb7, 0x01, 0x00, 0x00, 106 0x16, 0x03, 0x01, 0x00, 0x81, 0x01, 0x00, 0x00,
114 0xb3, 0x03, 0x02, 0x2f, 0x93, 0x9c, 0x37, 0x16, 107 0x7d, 0x03, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
115 0x88, 0x53, 0xa1, 0xba, 0xb2, 0x36, 0xc9, 0xdf, 108 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
116 0xa4, 0x5f, 0x80, 0x6a, 0x8b, 0xfe, 0x00, 0x52, 109 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
117 0xd3, 0xd2, 0x68, 0x2a, 0xae, 0xca, 0x72, 0xae, 110 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
118 0x70, 0x77, 0x84, 0x00, 0x00, 0x3e, 0xc0, 0x14, 111 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0xc0, 0x14,
119 0xc0, 0x0a, 0x00, 0x39, 0x00, 0x38, 0xff, 0x85, 112 0xc0, 0x0a, 0x00, 0x39, 0x00, 0x38, 0xff, 0x85,
120 0x00, 0x88, 0x00, 0x87, 0x00, 0x81, 0x00, 0x35, 113 0x00, 0x88, 0x00, 0x87, 0x00, 0x81, 0x00, 0x35,
121 0x00, 0x84, 0xc0, 0x13, 0xc0, 0x09, 0x00, 0x33, 114 0x00, 0x84, 0xc0, 0x13, 0xc0, 0x09, 0x00, 0x33,
@@ -123,17 +116,10 @@ static unsigned char client_hello_tls11[] = {
123 0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07, 0x00, 0x05, 116 0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07, 0x00, 0x05,
124 0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16, 117 0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16,
125 0x00, 0x13, 0x00, 0x0a, 0x00, 0x15, 0x00, 0x12, 118 0x00, 0x13, 0x00, 0x0a, 0x00, 0x15, 0x00, 0x12,
126 0x00, 0x09, 0x00, 0xff, 0x01, 0x00, 0x00, 0x4c, 119 0x00, 0x09, 0x00, 0xff, 0x01, 0x00, 0x00, 0x16,
127 0x00, 0x0b, 0x00, 0x04, 0x03, 0x00, 0x01, 0x02, 120 0x00, 0x0b, 0x00, 0x02, 0x01, 0x00, 0x00, 0x0a,
128 0x00, 0x0a, 0x00, 0x3c, 0x00, 0x3a, 0x00, 0x1d, 121 0x00, 0x08, 0x00, 0x06, 0x00, 0x1d, 0x00, 0x17,
129 0x00, 0x0e, 0x00, 0x0d, 0x00, 0x19, 0x00, 0x1c, 122 0x00, 0x18, 0x00, 0x23, 0x00, 0x00,
130 0x00, 0x0b, 0x00, 0x0c, 0x00, 0x1b, 0x00, 0x18,
131 0x00, 0x09, 0x00, 0x0a, 0x00, 0x1a, 0x00, 0x16,
132 0x00, 0x17, 0x00, 0x08, 0x00, 0x06, 0x00, 0x07,
133 0x00, 0x14, 0x00, 0x15, 0x00, 0x04, 0x00, 0x05,
134 0x00, 0x12, 0x00, 0x13, 0x00, 0x01, 0x00, 0x02,
135 0x00, 0x03, 0x00, 0x0f, 0x00, 0x10, 0x00, 0x11,
136 0x00, 0x23, 0x00, 0x00,
137}; 123};
138 124
139static unsigned char cipher_list_tls12_aes[] = { 125static unsigned char cipher_list_tls12_aes[] = {
@@ -175,8 +161,8 @@ static unsigned char cipher_list_tls12_chacha[] = {
175}; 161};
176 162
177static unsigned char client_hello_tls12[] = { 163static unsigned char client_hello_tls12[] = {
178 0x16, 0x03, 0x01, 0x01, 0x21, 0x01, 0x00, 0x01, 164 0x16, 0x03, 0x01, 0x00, 0xeb, 0x01, 0x00, 0x00,
179 0x1d, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 165 0xe7, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
180 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 166 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
181 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 167 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
182 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 168 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -196,22 +182,15 @@ static unsigned char client_hello_tls12[] = {
196 0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07, 0x00, 0x05, 182 0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07, 0x00, 0x05,
197 0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16, 183 0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16,
198 0x00, 0x13, 0x00, 0x0a, 0x00, 0x15, 0x00, 0x12, 184 0x00, 0x13, 0x00, 0x0a, 0x00, 0x15, 0x00, 0x12,
199 0x00, 0x09, 0x00, 0xff, 0x01, 0x00, 0x00, 0x76, 185 0x00, 0x09, 0x00, 0xff, 0x01, 0x00, 0x00, 0x40,
200 0x00, 0x0b, 0x00, 0x04, 0x03, 0x00, 0x01, 0x02, 186 0x00, 0x0b, 0x00, 0x02, 0x01, 0x00, 0x00, 0x0a,
201 0x00, 0x0a, 0x00, 0x3c, 0x00, 0x3a, 0x00, 0x1d, 187 0x00, 0x08, 0x00, 0x06, 0x00, 0x1d, 0x00, 0x17,
202 0x00, 0x0e, 0x00, 0x0d, 0x00, 0x19, 0x00, 0x1c, 188 0x00, 0x18, 0x00, 0x23, 0x00, 0x00, 0x00, 0x0d,
203 0x00, 0x0b, 0x00, 0x0c, 0x00, 0x1b, 0x00, 0x18, 189 0x00, 0x26, 0x00, 0x24, 0x06, 0x01, 0x06, 0x02,
204 0x00, 0x09, 0x00, 0x0a, 0x00, 0x1a, 0x00, 0x16, 190 0x06, 0x03, 0xef, 0xef, 0x05, 0x01, 0x05, 0x02,
205 0x00, 0x17, 0x00, 0x08, 0x00, 0x06, 0x00, 0x07, 191 0x05, 0x03, 0x04, 0x01, 0x04, 0x02, 0x04, 0x03,
206 0x00, 0x14, 0x00, 0x15, 0x00, 0x04, 0x00, 0x05, 192 0xee, 0xee, 0xed, 0xed, 0x03, 0x01, 0x03, 0x02,
207 0x00, 0x12, 0x00, 0x13, 0x00, 0x01, 0x00, 0x02, 193 0x03, 0x03, 0x02, 0x01, 0x02, 0x02, 0x02, 0x03,
208 0x00, 0x03, 0x00, 0x0f, 0x00, 0x10, 0x00, 0x11,
209 0x00, 0x23, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x26,
210 0x00, 0x24, 0x06, 0x01, 0x06, 0x02, 0x06, 0x03,
211 0xef, 0xef, 0x05, 0x01, 0x05, 0x02, 0x05, 0x03,
212 0x04, 0x01, 0x04, 0x02, 0x04, 0x03, 0xee, 0xee,
213 0xed, 0xed, 0x03, 0x01, 0x03, 0x02, 0x03, 0x03,
214 0x02, 0x01, 0x02, 0x02, 0x02, 0x03,
215}; 194};
216 195
217struct client_hello_test { 196struct client_hello_test {
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-22 09:01:07 +0000