summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_methods.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/ssl_methods.c')
-rw-r--r--src/lib/libssl/ssl_methods.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/src/lib/libssl/ssl_methods.c b/src/lib/libssl/ssl_methods.c
index ca80da62fd..dee52decf1 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.31 2023/07/08 16:40:13 beck Exp $ */ 1/* $OpenBSD: ssl_methods.c,v 1.32 2024/07/23 14:40:54 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 .get_cipher = dtls1_get_cipher,
81 .enc_flags = TLSV1_2_ENC_FLAGS, 80 .enc_flags = TLSV1_2_ENC_FLAGS,
82}; 81};
83 82
@@ -98,7 +97,6 @@ static const SSL_METHOD DTLS_client_method_data = {
98 .ssl_pending = ssl3_pending, 97 .ssl_pending = ssl3_pending,
99 .ssl_read_bytes = dtls1_read_bytes, 98 .ssl_read_bytes = dtls1_read_bytes,
100 .ssl_write_bytes = dtls1_write_app_data_bytes, 99 .ssl_write_bytes = dtls1_write_app_data_bytes,
101 .get_cipher = dtls1_get_cipher,
102 .enc_flags = TLSV1_2_ENC_FLAGS, 100 .enc_flags = TLSV1_2_ENC_FLAGS,
103}; 101};
104 102
@@ -119,7 +117,6 @@ static const SSL_METHOD DTLSv1_method_data = {
119 .ssl_pending = ssl3_pending, 117 .ssl_pending = ssl3_pending,
120 .ssl_read_bytes = dtls1_read_bytes, 118 .ssl_read_bytes = dtls1_read_bytes,
121 .ssl_write_bytes = dtls1_write_app_data_bytes, 119 .ssl_write_bytes = dtls1_write_app_data_bytes,
122 .get_cipher = dtls1_get_cipher,
123 .enc_flags = TLSV1_1_ENC_FLAGS, 120 .enc_flags = TLSV1_1_ENC_FLAGS,
124}; 121};
125 122
@@ -140,7 +137,6 @@ static const SSL_METHOD DTLSv1_client_method_data = {
140 .ssl_pending = ssl3_pending, 137 .ssl_pending = ssl3_pending,
141 .ssl_read_bytes = dtls1_read_bytes, 138 .ssl_read_bytes = dtls1_read_bytes,
142 .ssl_write_bytes = dtls1_write_app_data_bytes, 139 .ssl_write_bytes = dtls1_write_app_data_bytes,
143 .get_cipher = dtls1_get_cipher,
144 .enc_flags = TLSV1_1_ENC_FLAGS, 140 .enc_flags = TLSV1_1_ENC_FLAGS,
145}; 141};
146 142
@@ -161,7 +157,6 @@ static const SSL_METHOD DTLSv1_2_method_data = {
161 .ssl_pending = ssl3_pending, 157 .ssl_pending = ssl3_pending,
162 .ssl_read_bytes = dtls1_read_bytes, 158 .ssl_read_bytes = dtls1_read_bytes,
163 .ssl_write_bytes = dtls1_write_app_data_bytes, 159 .ssl_write_bytes = dtls1_write_app_data_bytes,
164 .get_cipher = dtls1_get_cipher,
165 .enc_flags = TLSV1_2_ENC_FLAGS, 160 .enc_flags = TLSV1_2_ENC_FLAGS,
166}; 161};
167 162
@@ -182,7 +177,6 @@ static const SSL_METHOD DTLSv1_2_client_method_data = {
182 .ssl_pending = ssl3_pending, 177 .ssl_pending = ssl3_pending,
183 .ssl_read_bytes = dtls1_read_bytes, 178 .ssl_read_bytes = dtls1_read_bytes,
184 .ssl_write_bytes = dtls1_write_app_data_bytes, 179 .ssl_write_bytes = dtls1_write_app_data_bytes,
185 .get_cipher = dtls1_get_cipher,
186 .enc_flags = TLSV1_2_ENC_FLAGS, 180 .enc_flags = TLSV1_2_ENC_FLAGS,
187}; 181};
188 182
@@ -266,7 +260,6 @@ static const SSL_METHOD TLS_method_data = {
266 .ssl_pending = tls13_legacy_pending, 260 .ssl_pending = tls13_legacy_pending,
267 .ssl_read_bytes = tls13_legacy_read_bytes, 261 .ssl_read_bytes = tls13_legacy_read_bytes,
268 .ssl_write_bytes = tls13_legacy_write_bytes, 262 .ssl_write_bytes = tls13_legacy_write_bytes,
269 .get_cipher = ssl3_get_cipher,
270 .enc_flags = TLSV1_3_ENC_FLAGS, 263 .enc_flags = TLSV1_3_ENC_FLAGS,
271}; 264};
272 265
@@ -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 .get_cipher = ssl3_get_cipher,
291 .enc_flags = TLSV1_2_ENC_FLAGS, 283 .enc_flags = TLSV1_2_ENC_FLAGS,
292}; 284};
293 285
@@ -308,7 +300,6 @@ static const SSL_METHOD TLS_client_method_data = {
308 .ssl_pending = tls13_legacy_pending, 300 .ssl_pending = tls13_legacy_pending,
309 .ssl_read_bytes = tls13_legacy_read_bytes, 301 .ssl_read_bytes = tls13_legacy_read_bytes,
310 .ssl_write_bytes = tls13_legacy_write_bytes, 302 .ssl_write_bytes = tls13_legacy_write_bytes,
311 .get_cipher = ssl3_get_cipher,
312 .enc_flags = TLSV1_3_ENC_FLAGS, 303 .enc_flags = TLSV1_3_ENC_FLAGS,
313}; 304};
314 305
@@ -329,7 +320,6 @@ static const SSL_METHOD TLSv1_method_data = {
329 .ssl_pending = ssl3_pending, 320 .ssl_pending = ssl3_pending,
330 .ssl_read_bytes = ssl3_read_bytes, 321 .ssl_read_bytes = ssl3_read_bytes,
331 .ssl_write_bytes = ssl3_write_bytes, 322 .ssl_write_bytes = ssl3_write_bytes,
332 .get_cipher = ssl3_get_cipher,
333 .enc_flags = TLSV1_ENC_FLAGS, 323 .enc_flags = TLSV1_ENC_FLAGS,
334}; 324};
335 325
@@ -350,7 +340,6 @@ static const SSL_METHOD TLSv1_client_method_data = {
350 .ssl_pending = ssl3_pending, 340 .ssl_pending = ssl3_pending,
351 .ssl_read_bytes = ssl3_read_bytes, 341 .ssl_read_bytes = ssl3_read_bytes,
352 .ssl_write_bytes = ssl3_write_bytes, 342 .ssl_write_bytes = ssl3_write_bytes,
353 .get_cipher = ssl3_get_cipher,
354 .enc_flags = TLSV1_ENC_FLAGS, 343 .enc_flags = TLSV1_ENC_FLAGS,
355}; 344};
356 345
@@ -371,7 +360,6 @@ static const SSL_METHOD TLSv1_1_method_data = {
371 .ssl_pending = ssl3_pending, 360 .ssl_pending = ssl3_pending,
372 .ssl_read_bytes = ssl3_read_bytes, 361 .ssl_read_bytes = ssl3_read_bytes,
373 .ssl_write_bytes = ssl3_write_bytes, 362 .ssl_write_bytes = ssl3_write_bytes,
374 .get_cipher = ssl3_get_cipher,
375 .enc_flags = TLSV1_1_ENC_FLAGS, 363 .enc_flags = TLSV1_1_ENC_FLAGS,
376}; 364};
377 365
@@ -392,7 +380,6 @@ static const SSL_METHOD TLSv1_1_client_method_data = {
392 .ssl_pending = ssl3_pending, 380 .ssl_pending = ssl3_pending,
393 .ssl_read_bytes = ssl3_read_bytes, 381 .ssl_read_bytes = ssl3_read_bytes,
394 .ssl_write_bytes = ssl3_write_bytes, 382 .ssl_write_bytes = ssl3_write_bytes,
395 .get_cipher = ssl3_get_cipher,
396 .enc_flags = TLSV1_1_ENC_FLAGS, 383 .enc_flags = TLSV1_1_ENC_FLAGS,
397}; 384};
398 385
@@ -413,7 +400,6 @@ static const SSL_METHOD TLSv1_2_method_data = {
413 .ssl_pending = ssl3_pending, 400 .ssl_pending = ssl3_pending,
414 .ssl_read_bytes = ssl3_read_bytes, 401 .ssl_read_bytes = ssl3_read_bytes,
415 .ssl_write_bytes = ssl3_write_bytes, 402 .ssl_write_bytes = ssl3_write_bytes,
416 .get_cipher = ssl3_get_cipher,
417 .enc_flags = TLSV1_2_ENC_FLAGS, 403 .enc_flags = TLSV1_2_ENC_FLAGS,
418}; 404};
419 405
@@ -434,7 +420,6 @@ static const SSL_METHOD TLSv1_2_client_method_data = {
434 .ssl_pending = ssl3_pending, 420 .ssl_pending = ssl3_pending,
435 .ssl_read_bytes = ssl3_read_bytes, 421 .ssl_read_bytes = ssl3_read_bytes,
436 .ssl_write_bytes = ssl3_write_bytes, 422 .ssl_write_bytes = ssl3_write_bytes,
437 .get_cipher = ssl3_get_cipher,
438 .enc_flags = TLSV1_2_ENC_FLAGS, 423 .enc_flags = TLSV1_2_ENC_FLAGS,
439}; 424};
440 425