diff options
Diffstat (limited to 'src/lib/libssl/ssl_methods.c')
-rw-r--r-- | src/lib/libssl/ssl_methods.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/src/lib/libssl/ssl_methods.c b/src/lib/libssl/ssl_methods.c index b9b8a95e56..d8ffbb7b51 100644 --- a/src/lib/libssl/ssl_methods.c +++ b/src/lib/libssl/ssl_methods.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_methods.c,v 1.27 2021/07/03 16:06:45 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_methods.c,v 1.28 2021/07/26 03:17:38 jsing 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 | * |
@@ -77,7 +77,6 @@ static const SSL_METHOD DTLS_method_data = { | |||
77 | .ssl_pending = ssl3_pending, | 77 | .ssl_pending = ssl3_pending, |
78 | .ssl_read_bytes = dtls1_read_bytes, | 78 | .ssl_read_bytes = dtls1_read_bytes, |
79 | .ssl_write_bytes = dtls1_write_app_data_bytes, | 79 | .ssl_write_bytes = dtls1_write_app_data_bytes, |
80 | .ssl_dispatch_alert = dtls1_dispatch_alert, | ||
81 | .get_cipher = dtls1_get_cipher, | 80 | .get_cipher = dtls1_get_cipher, |
82 | .enc_flags = TLSV1_2_ENC_FLAGS, | 81 | .enc_flags = TLSV1_2_ENC_FLAGS, |
83 | }; | 82 | }; |
@@ -99,7 +98,6 @@ static const SSL_METHOD DTLS_client_method_data = { | |||
99 | .ssl_pending = ssl3_pending, | 98 | .ssl_pending = ssl3_pending, |
100 | .ssl_read_bytes = dtls1_read_bytes, | 99 | .ssl_read_bytes = dtls1_read_bytes, |
101 | .ssl_write_bytes = dtls1_write_app_data_bytes, | 100 | .ssl_write_bytes = dtls1_write_app_data_bytes, |
102 | .ssl_dispatch_alert = dtls1_dispatch_alert, | ||
103 | .get_cipher = dtls1_get_cipher, | 101 | .get_cipher = dtls1_get_cipher, |
104 | .enc_flags = TLSV1_2_ENC_FLAGS, | 102 | .enc_flags = TLSV1_2_ENC_FLAGS, |
105 | }; | 103 | }; |
@@ -121,7 +119,6 @@ static const SSL_METHOD DTLSv1_method_data = { | |||
121 | .ssl_pending = ssl3_pending, | 119 | .ssl_pending = ssl3_pending, |
122 | .ssl_read_bytes = dtls1_read_bytes, | 120 | .ssl_read_bytes = dtls1_read_bytes, |
123 | .ssl_write_bytes = dtls1_write_app_data_bytes, | 121 | .ssl_write_bytes = dtls1_write_app_data_bytes, |
124 | .ssl_dispatch_alert = dtls1_dispatch_alert, | ||
125 | .get_cipher = dtls1_get_cipher, | 122 | .get_cipher = dtls1_get_cipher, |
126 | .enc_flags = TLSV1_1_ENC_FLAGS, | 123 | .enc_flags = TLSV1_1_ENC_FLAGS, |
127 | }; | 124 | }; |
@@ -143,7 +140,6 @@ static const SSL_METHOD DTLSv1_client_method_data = { | |||
143 | .ssl_pending = ssl3_pending, | 140 | .ssl_pending = ssl3_pending, |
144 | .ssl_read_bytes = dtls1_read_bytes, | 141 | .ssl_read_bytes = dtls1_read_bytes, |
145 | .ssl_write_bytes = dtls1_write_app_data_bytes, | 142 | .ssl_write_bytes = dtls1_write_app_data_bytes, |
146 | .ssl_dispatch_alert = dtls1_dispatch_alert, | ||
147 | .get_cipher = dtls1_get_cipher, | 143 | .get_cipher = dtls1_get_cipher, |
148 | .enc_flags = TLSV1_1_ENC_FLAGS, | 144 | .enc_flags = TLSV1_1_ENC_FLAGS, |
149 | }; | 145 | }; |
@@ -165,7 +161,6 @@ static const SSL_METHOD DTLSv1_2_method_data = { | |||
165 | .ssl_pending = ssl3_pending, | 161 | .ssl_pending = ssl3_pending, |
166 | .ssl_read_bytes = dtls1_read_bytes, | 162 | .ssl_read_bytes = dtls1_read_bytes, |
167 | .ssl_write_bytes = dtls1_write_app_data_bytes, | 163 | .ssl_write_bytes = dtls1_write_app_data_bytes, |
168 | .ssl_dispatch_alert = dtls1_dispatch_alert, | ||
169 | .get_cipher = dtls1_get_cipher, | 164 | .get_cipher = dtls1_get_cipher, |
170 | .enc_flags = TLSV1_2_ENC_FLAGS, | 165 | .enc_flags = TLSV1_2_ENC_FLAGS, |
171 | }; | 166 | }; |
@@ -187,7 +182,6 @@ static const SSL_METHOD DTLSv1_2_client_method_data = { | |||
187 | .ssl_pending = ssl3_pending, | 182 | .ssl_pending = ssl3_pending, |
188 | .ssl_read_bytes = dtls1_read_bytes, | 183 | .ssl_read_bytes = dtls1_read_bytes, |
189 | .ssl_write_bytes = dtls1_write_app_data_bytes, | 184 | .ssl_write_bytes = dtls1_write_app_data_bytes, |
190 | .ssl_dispatch_alert = dtls1_dispatch_alert, | ||
191 | .get_cipher = dtls1_get_cipher, | 185 | .get_cipher = dtls1_get_cipher, |
192 | .enc_flags = TLSV1_2_ENC_FLAGS, | 186 | .enc_flags = TLSV1_2_ENC_FLAGS, |
193 | }; | 187 | }; |
@@ -264,7 +258,6 @@ static const SSL_METHOD TLS_method_data = { | |||
264 | .ssl_pending = tls13_legacy_pending, | 258 | .ssl_pending = tls13_legacy_pending, |
265 | .ssl_read_bytes = tls13_legacy_read_bytes, | 259 | .ssl_read_bytes = tls13_legacy_read_bytes, |
266 | .ssl_write_bytes = tls13_legacy_write_bytes, | 260 | .ssl_write_bytes = tls13_legacy_write_bytes, |
267 | .ssl_dispatch_alert = ssl3_dispatch_alert, | ||
268 | .get_cipher = ssl3_get_cipher, | 261 | .get_cipher = ssl3_get_cipher, |
269 | .enc_flags = TLSV1_3_ENC_FLAGS, | 262 | .enc_flags = TLSV1_3_ENC_FLAGS, |
270 | }; | 263 | }; |
@@ -287,7 +280,6 @@ static const SSL_METHOD TLS_legacy_method_data = { | |||
287 | .ssl_pending = ssl3_pending, | 280 | .ssl_pending = ssl3_pending, |
288 | .ssl_read_bytes = ssl3_read_bytes, | 281 | .ssl_read_bytes = ssl3_read_bytes, |
289 | .ssl_write_bytes = ssl3_write_bytes, | 282 | .ssl_write_bytes = ssl3_write_bytes, |
290 | .ssl_dispatch_alert = ssl3_dispatch_alert, | ||
291 | .get_cipher = ssl3_get_cipher, | 283 | .get_cipher = ssl3_get_cipher, |
292 | .enc_flags = TLSV1_2_ENC_FLAGS, | 284 | .enc_flags = TLSV1_2_ENC_FLAGS, |
293 | }; | 285 | }; |
@@ -310,7 +302,6 @@ static const SSL_METHOD TLS_client_method_data = { | |||
310 | .ssl_pending = tls13_legacy_pending, | 302 | .ssl_pending = tls13_legacy_pending, |
311 | .ssl_read_bytes = tls13_legacy_read_bytes, | 303 | .ssl_read_bytes = tls13_legacy_read_bytes, |
312 | .ssl_write_bytes = tls13_legacy_write_bytes, | 304 | .ssl_write_bytes = tls13_legacy_write_bytes, |
313 | .ssl_dispatch_alert = ssl3_dispatch_alert, | ||
314 | .get_cipher = ssl3_get_cipher, | 305 | .get_cipher = ssl3_get_cipher, |
315 | .enc_flags = TLSV1_3_ENC_FLAGS, | 306 | .enc_flags = TLSV1_3_ENC_FLAGS, |
316 | }; | 307 | }; |
@@ -334,7 +325,6 @@ static const SSL_METHOD TLS_legacy_client_method_data = { | |||
334 | .ssl_pending = ssl3_pending, | 325 | .ssl_pending = ssl3_pending, |
335 | .ssl_read_bytes = ssl3_read_bytes, | 326 | .ssl_read_bytes = ssl3_read_bytes, |
336 | .ssl_write_bytes = ssl3_write_bytes, | 327 | .ssl_write_bytes = ssl3_write_bytes, |
337 | .ssl_dispatch_alert = ssl3_dispatch_alert, | ||
338 | .get_cipher = ssl3_get_cipher, | 328 | .get_cipher = ssl3_get_cipher, |
339 | .enc_flags = TLSV1_2_ENC_FLAGS, | 329 | .enc_flags = TLSV1_2_ENC_FLAGS, |
340 | }; | 330 | }; |
@@ -357,7 +347,6 @@ static const SSL_METHOD TLSv1_method_data = { | |||
357 | .ssl_pending = ssl3_pending, | 347 | .ssl_pending = ssl3_pending, |
358 | .ssl_read_bytes = ssl3_read_bytes, | 348 | .ssl_read_bytes = ssl3_read_bytes, |
359 | .ssl_write_bytes = ssl3_write_bytes, | 349 | .ssl_write_bytes = ssl3_write_bytes, |
360 | .ssl_dispatch_alert = ssl3_dispatch_alert, | ||
361 | .get_cipher = ssl3_get_cipher, | 350 | .get_cipher = ssl3_get_cipher, |
362 | .enc_flags = TLSV1_ENC_FLAGS, | 351 | .enc_flags = TLSV1_ENC_FLAGS, |
363 | }; | 352 | }; |
@@ -379,7 +368,6 @@ static const SSL_METHOD TLSv1_client_method_data = { | |||
379 | .ssl_pending = ssl3_pending, | 368 | .ssl_pending = ssl3_pending, |
380 | .ssl_read_bytes = ssl3_read_bytes, | 369 | .ssl_read_bytes = ssl3_read_bytes, |
381 | .ssl_write_bytes = ssl3_write_bytes, | 370 | .ssl_write_bytes = ssl3_write_bytes, |
382 | .ssl_dispatch_alert = ssl3_dispatch_alert, | ||
383 | .get_cipher = ssl3_get_cipher, | 371 | .get_cipher = ssl3_get_cipher, |
384 | .enc_flags = TLSV1_ENC_FLAGS, | 372 | .enc_flags = TLSV1_ENC_FLAGS, |
385 | }; | 373 | }; |
@@ -401,7 +389,6 @@ static const SSL_METHOD TLSv1_1_method_data = { | |||
401 | .ssl_pending = ssl3_pending, | 389 | .ssl_pending = ssl3_pending, |
402 | .ssl_read_bytes = ssl3_read_bytes, | 390 | .ssl_read_bytes = ssl3_read_bytes, |
403 | .ssl_write_bytes = ssl3_write_bytes, | 391 | .ssl_write_bytes = ssl3_write_bytes, |
404 | .ssl_dispatch_alert = ssl3_dispatch_alert, | ||
405 | .get_cipher = ssl3_get_cipher, | 392 | .get_cipher = ssl3_get_cipher, |
406 | .enc_flags = TLSV1_1_ENC_FLAGS, | 393 | .enc_flags = TLSV1_1_ENC_FLAGS, |
407 | }; | 394 | }; |
@@ -423,7 +410,6 @@ static const SSL_METHOD TLSv1_1_client_method_data = { | |||
423 | .ssl_pending = ssl3_pending, | 410 | .ssl_pending = ssl3_pending, |
424 | .ssl_read_bytes = ssl3_read_bytes, | 411 | .ssl_read_bytes = ssl3_read_bytes, |
425 | .ssl_write_bytes = ssl3_write_bytes, | 412 | .ssl_write_bytes = ssl3_write_bytes, |
426 | .ssl_dispatch_alert = ssl3_dispatch_alert, | ||
427 | .get_cipher = ssl3_get_cipher, | 413 | .get_cipher = ssl3_get_cipher, |
428 | .enc_flags = TLSV1_1_ENC_FLAGS, | 414 | .enc_flags = TLSV1_1_ENC_FLAGS, |
429 | }; | 415 | }; |
@@ -445,7 +431,6 @@ static const SSL_METHOD TLSv1_2_method_data = { | |||
445 | .ssl_pending = ssl3_pending, | 431 | .ssl_pending = ssl3_pending, |
446 | .ssl_read_bytes = ssl3_read_bytes, | 432 | .ssl_read_bytes = ssl3_read_bytes, |
447 | .ssl_write_bytes = ssl3_write_bytes, | 433 | .ssl_write_bytes = ssl3_write_bytes, |
448 | .ssl_dispatch_alert = ssl3_dispatch_alert, | ||
449 | .get_cipher = ssl3_get_cipher, | 434 | .get_cipher = ssl3_get_cipher, |
450 | .enc_flags = TLSV1_2_ENC_FLAGS, | 435 | .enc_flags = TLSV1_2_ENC_FLAGS, |
451 | }; | 436 | }; |
@@ -467,7 +452,6 @@ static const SSL_METHOD TLSv1_2_client_method_data = { | |||
467 | .ssl_pending = ssl3_pending, | 452 | .ssl_pending = ssl3_pending, |
468 | .ssl_read_bytes = ssl3_read_bytes, | 453 | .ssl_read_bytes = ssl3_read_bytes, |
469 | .ssl_write_bytes = ssl3_write_bytes, | 454 | .ssl_write_bytes = ssl3_write_bytes, |
470 | .ssl_dispatch_alert = ssl3_dispatch_alert, | ||
471 | .get_cipher = ssl3_get_cipher, | 455 | .get_cipher = ssl3_get_cipher, |
472 | .enc_flags = TLSV1_2_ENC_FLAGS, | 456 | .enc_flags = TLSV1_2_ENC_FLAGS, |
473 | }; | 457 | }; |