diff options
Diffstat (limited to '')
| -rw-r--r-- | src/regress/lib/libssl/unit/ssl_versions.c | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/src/regress/lib/libssl/unit/ssl_versions.c b/src/regress/lib/libssl/unit/ssl_versions.c index 261bed3a7a..ebfe8d2c28 100644 --- a/src/regress/lib/libssl/unit/ssl_versions.c +++ b/src/regress/lib/libssl/unit/ssl_versions.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_versions.c,v 1.19 2022/11/26 16:08:57 tb Exp $ */ | 1 | /* $OpenBSD: ssl_versions.c,v 1.20 2023/07/02 17:21:33 beck Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2016, 2017 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2016, 2017 Joel Sing <jsing@openbsd.org> |
| 4 | * | 4 | * |
| @@ -32,43 +32,43 @@ static struct version_range_test version_range_tests[] = { | |||
| 32 | .options = 0, | 32 | .options = 0, |
| 33 | .minver = TLS1_VERSION, | 33 | .minver = TLS1_VERSION, |
| 34 | .maxver = TLS1_3_VERSION, | 34 | .maxver = TLS1_3_VERSION, |
| 35 | .want_minver = TLS1_VERSION, | 35 | .want_minver = TLS1_2_VERSION, |
| 36 | .want_maxver = TLS1_3_VERSION, | 36 | .want_maxver = TLS1_3_VERSION, |
| 37 | }, | 37 | }, |
| 38 | { | 38 | { |
| 39 | .options = 0, | 39 | .options = 0, |
| 40 | .minver = TLS1_VERSION, | 40 | .minver = TLS1_VERSION, |
| 41 | .maxver = TLS1_2_VERSION, | 41 | .maxver = TLS1_2_VERSION, |
| 42 | .want_minver = TLS1_VERSION, | 42 | .want_minver = TLS1_2_VERSION, |
| 43 | .want_maxver = TLS1_2_VERSION, | 43 | .want_maxver = TLS1_2_VERSION, |
| 44 | }, | 44 | }, |
| 45 | { | 45 | { |
| 46 | .options = SSL_OP_NO_TLSv1, | 46 | .options = SSL_OP_NO_TLSv1, |
| 47 | .minver = TLS1_VERSION, | 47 | .minver = TLS1_VERSION, |
| 48 | .maxver = TLS1_2_VERSION, | 48 | .maxver = TLS1_2_VERSION, |
| 49 | .want_minver = TLS1_1_VERSION, | 49 | .want_minver = TLS1_2_VERSION, |
| 50 | .want_maxver = TLS1_2_VERSION, | 50 | .want_maxver = TLS1_2_VERSION, |
| 51 | }, | 51 | }, |
| 52 | { | 52 | { |
| 53 | .options = SSL_OP_NO_TLSv1_3, | 53 | .options = SSL_OP_NO_TLSv1_3, |
| 54 | .minver = TLS1_VERSION, | 54 | .minver = TLS1_VERSION, |
| 55 | .maxver = TLS1_3_VERSION, | 55 | .maxver = TLS1_3_VERSION, |
| 56 | .want_minver = TLS1_VERSION, | 56 | .want_minver = TLS1_2_VERSION, |
| 57 | .want_maxver = TLS1_2_VERSION, | 57 | .want_maxver = TLS1_2_VERSION, |
| 58 | }, | 58 | }, |
| 59 | { | 59 | { |
| 60 | .options = SSL_OP_NO_TLSv1_2, | 60 | .options = SSL_OP_NO_TLSv1_2, |
| 61 | .minver = TLS1_VERSION, | 61 | .minver = TLS1_VERSION, |
| 62 | .maxver = TLS1_2_VERSION, | 62 | .maxver = TLS1_2_VERSION, |
| 63 | .want_minver = TLS1_VERSION, | 63 | .want_minver = 0, |
| 64 | .want_maxver = TLS1_1_VERSION, | 64 | .want_maxver = 0, |
| 65 | }, | 65 | }, |
| 66 | { | 66 | { |
| 67 | .options = SSL_OP_NO_TLSv1_1, | 67 | .options = SSL_OP_NO_TLSv1_1, |
| 68 | .minver = TLS1_VERSION, | 68 | .minver = TLS1_VERSION, |
| 69 | .maxver = TLS1_2_VERSION, | 69 | .maxver = TLS1_2_VERSION, |
| 70 | .want_minver = TLS1_VERSION, | 70 | .want_minver = TLS1_2_VERSION, |
| 71 | .want_maxver = TLS1_VERSION, | 71 | .want_maxver = TLS1_2_VERSION, |
| 72 | }, | 72 | }, |
| 73 | { | 73 | { |
| 74 | .options = SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1, | 74 | .options = SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1, |
| @@ -81,15 +81,15 @@ static struct version_range_test version_range_tests[] = { | |||
| 81 | .options = SSL_OP_NO_TLSv1_1 | SSL_OP_NO_TLSv1_2, | 81 | .options = SSL_OP_NO_TLSv1_1 | SSL_OP_NO_TLSv1_2, |
| 82 | .minver = TLS1_VERSION, | 82 | .minver = TLS1_VERSION, |
| 83 | .maxver = TLS1_2_VERSION, | 83 | .maxver = TLS1_2_VERSION, |
| 84 | .want_minver = TLS1_VERSION, | 84 | .want_minver = 0, |
| 85 | .want_maxver = TLS1_VERSION, | 85 | .want_maxver = 0, |
| 86 | }, | 86 | }, |
| 87 | { | 87 | { |
| 88 | .options = SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_2, | 88 | .options = SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_2, |
| 89 | .minver = TLS1_VERSION, | 89 | .minver = TLS1_VERSION, |
| 90 | .maxver = TLS1_2_VERSION, | 90 | .maxver = TLS1_2_VERSION, |
| 91 | .want_minver = TLS1_1_VERSION, | 91 | .want_minver = 0, |
| 92 | .want_maxver = TLS1_1_VERSION, | 92 | .want_maxver = 0, |
| 93 | }, | 93 | }, |
| 94 | { | 94 | { |
| 95 | .options = SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1 | | 95 | .options = SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1 | |
| @@ -119,14 +119,14 @@ static struct version_range_test version_range_tests[] = { | |||
| 119 | .options = 0, | 119 | .options = 0, |
| 120 | .minver = TLS1_VERSION, | 120 | .minver = TLS1_VERSION, |
| 121 | .maxver = TLS1_2_VERSION, | 121 | .maxver = TLS1_2_VERSION, |
| 122 | .want_minver = TLS1_VERSION, | 122 | .want_minver = TLS1_2_VERSION, |
| 123 | .want_maxver = TLS1_2_VERSION, | 123 | .want_maxver = TLS1_2_VERSION, |
| 124 | }, | 124 | }, |
| 125 | { | 125 | { |
| 126 | .options = 0, | 126 | .options = 0, |
| 127 | .minver = TLS1_1_VERSION, | 127 | .minver = TLS1_1_VERSION, |
| 128 | .maxver = TLS1_2_VERSION, | 128 | .maxver = TLS1_2_VERSION, |
| 129 | .want_minver = TLS1_1_VERSION, | 129 | .want_minver = TLS1_2_VERSION, |
| 130 | .want_maxver = TLS1_2_VERSION, | 130 | .want_maxver = TLS1_2_VERSION, |
| 131 | }, | 131 | }, |
| 132 | { | 132 | { |
| @@ -140,14 +140,14 @@ static struct version_range_test version_range_tests[] = { | |||
| 140 | .options = 0, | 140 | .options = 0, |
| 141 | .minver = TLS1_VERSION, | 141 | .minver = TLS1_VERSION, |
| 142 | .maxver = TLS1_3_VERSION, | 142 | .maxver = TLS1_3_VERSION, |
| 143 | .want_minver = TLS1_VERSION, | 143 | .want_minver = TLS1_2_VERSION, |
| 144 | .want_maxver = TLS1_3_VERSION, | 144 | .want_maxver = TLS1_3_VERSION, |
| 145 | }, | 145 | }, |
| 146 | { | 146 | { |
| 147 | .options = 0, | 147 | .options = 0, |
| 148 | .minver = TLS1_1_VERSION, | 148 | .minver = TLS1_1_VERSION, |
| 149 | .maxver = TLS1_3_VERSION, | 149 | .maxver = TLS1_3_VERSION, |
| 150 | .want_minver = TLS1_1_VERSION, | 150 | .want_minver = TLS1_2_VERSION, |
| 151 | .want_maxver = TLS1_3_VERSION, | 151 | .want_maxver = TLS1_3_VERSION, |
| 152 | }, | 152 | }, |
| 153 | { | 153 | { |
| @@ -168,15 +168,15 @@ static struct version_range_test version_range_tests[] = { | |||
| 168 | .options = 0, | 168 | .options = 0, |
| 169 | .minver = TLS1_VERSION, | 169 | .minver = TLS1_VERSION, |
| 170 | .maxver = TLS1_1_VERSION, | 170 | .maxver = TLS1_1_VERSION, |
| 171 | .want_minver = TLS1_VERSION, | 171 | .want_minver = 0, |
| 172 | .want_maxver = TLS1_1_VERSION, | 172 | .want_maxver = 0, |
| 173 | }, | 173 | }, |
| 174 | { | 174 | { |
| 175 | .options = 0, | 175 | .options = 0, |
| 176 | .minver = TLS1_VERSION, | 176 | .minver = TLS1_VERSION, |
| 177 | .maxver = TLS1_VERSION, | 177 | .maxver = TLS1_VERSION, |
| 178 | .want_minver = TLS1_VERSION, | 178 | .want_minver = 0, |
| 179 | .want_maxver = TLS1_VERSION, | 179 | .want_maxver = 0, |
| 180 | }, | 180 | }, |
| 181 | }; | 181 | }; |
| 182 | 182 | ||
| @@ -276,7 +276,7 @@ static struct shared_version_test shared_version_tests[] = { | |||
| 276 | .minver = TLS1_VERSION, | 276 | .minver = TLS1_VERSION, |
| 277 | .maxver = TLS1_2_VERSION, | 277 | .maxver = TLS1_2_VERSION, |
| 278 | .peerver = TLS1_VERSION, | 278 | .peerver = TLS1_VERSION, |
| 279 | .want_maxver = TLS1_VERSION, | 279 | .want_maxver = 0, |
| 280 | }, | 280 | }, |
| 281 | { | 281 | { |
| 282 | .ssl_method = TLS_method, | 282 | .ssl_method = TLS_method, |
| @@ -284,7 +284,7 @@ static struct shared_version_test shared_version_tests[] = { | |||
| 284 | .minver = TLS1_VERSION, | 284 | .minver = TLS1_VERSION, |
| 285 | .maxver = TLS1_2_VERSION, | 285 | .maxver = TLS1_2_VERSION, |
| 286 | .peerver = TLS1_1_VERSION, | 286 | .peerver = TLS1_1_VERSION, |
| 287 | .want_maxver = TLS1_1_VERSION, | 287 | .want_maxver = 0, |
| 288 | }, | 288 | }, |
| 289 | { | 289 | { |
| 290 | .ssl_method = TLS_method, | 290 | .ssl_method = TLS_method, |
| @@ -316,7 +316,7 @@ static struct shared_version_test shared_version_tests[] = { | |||
| 316 | .minver = TLS1_VERSION, | 316 | .minver = TLS1_VERSION, |
| 317 | .maxver = TLS1_2_VERSION, | 317 | .maxver = TLS1_2_VERSION, |
| 318 | .peerver = TLS1_2_VERSION, | 318 | .peerver = TLS1_2_VERSION, |
| 319 | .want_maxver = TLS1_1_VERSION, | 319 | .want_maxver = 0, |
| 320 | }, | 320 | }, |
| 321 | { | 321 | { |
| 322 | .ssl_method = TLS_method, | 322 | .ssl_method = TLS_method, |
| @@ -324,7 +324,7 @@ static struct shared_version_test shared_version_tests[] = { | |||
| 324 | .minver = TLS1_VERSION, | 324 | .minver = TLS1_VERSION, |
| 325 | .maxver = TLS1_2_VERSION, | 325 | .maxver = TLS1_2_VERSION, |
| 326 | .peerver = TLS1_2_VERSION, | 326 | .peerver = TLS1_2_VERSION, |
| 327 | .want_maxver = TLS1_VERSION, | 327 | .want_maxver = 0, |
| 328 | }, | 328 | }, |
| 329 | { | 329 | { |
| 330 | .ssl_method = TLS_method, | 330 | .ssl_method = TLS_method, |
| @@ -340,7 +340,7 @@ static struct shared_version_test shared_version_tests[] = { | |||
| 340 | .minver = TLS1_VERSION, | 340 | .minver = TLS1_VERSION, |
| 341 | .maxver = TLS1_2_VERSION, | 341 | .maxver = TLS1_2_VERSION, |
| 342 | .peerver = TLS1_1_VERSION, | 342 | .peerver = TLS1_1_VERSION, |
| 343 | .want_maxver = TLS1_1_VERSION, | 343 | .want_maxver = 0, |
| 344 | }, | 344 | }, |
| 345 | { | 345 | { |
| 346 | .ssl_method = TLS_method, | 346 | .ssl_method = TLS_method, |
| @@ -356,7 +356,7 @@ static struct shared_version_test shared_version_tests[] = { | |||
| 356 | .minver = TLS1_VERSION, | 356 | .minver = TLS1_VERSION, |
| 357 | .maxver = TLS1_2_VERSION, | 357 | .maxver = TLS1_2_VERSION, |
| 358 | .peerver = TLS1_1_VERSION, | 358 | .peerver = TLS1_1_VERSION, |
| 359 | .want_maxver = TLS1_VERSION, | 359 | .want_maxver = 0, |
| 360 | }, | 360 | }, |
| 361 | { | 361 | { |
| 362 | .ssl_method = TLS_method, | 362 | .ssl_method = TLS_method, |
| @@ -372,7 +372,7 @@ static struct shared_version_test shared_version_tests[] = { | |||
| 372 | .minver = TLS1_VERSION, | 372 | .minver = TLS1_VERSION, |
| 373 | .maxver = TLS1_1_VERSION, | 373 | .maxver = TLS1_1_VERSION, |
| 374 | .peerver = TLS1_2_VERSION, | 374 | .peerver = TLS1_2_VERSION, |
| 375 | .want_maxver = TLS1_1_VERSION, | 375 | .want_maxver = 0, |
| 376 | }, | 376 | }, |
| 377 | { | 377 | { |
| 378 | .ssl_method = TLS_method, | 378 | .ssl_method = TLS_method, |
| @@ -380,7 +380,7 @@ static struct shared_version_test shared_version_tests[] = { | |||
| 380 | .minver = TLS1_VERSION, | 380 | .minver = TLS1_VERSION, |
| 381 | .maxver = TLS1_VERSION, | 381 | .maxver = TLS1_VERSION, |
| 382 | .peerver = TLS1_2_VERSION, | 382 | .peerver = TLS1_2_VERSION, |
| 383 | .want_maxver = TLS1_VERSION, | 383 | .want_maxver = 0, |
| 384 | }, | 384 | }, |
| 385 | { | 385 | { |
| 386 | .ssl_method = TLSv1_method, | 386 | .ssl_method = TLSv1_method, |
| @@ -388,7 +388,7 @@ static struct shared_version_test shared_version_tests[] = { | |||
| 388 | .minver = TLS1_VERSION, | 388 | .minver = TLS1_VERSION, |
| 389 | .maxver = TLS1_2_VERSION, | 389 | .maxver = TLS1_2_VERSION, |
| 390 | .peerver = TLS1_VERSION, | 390 | .peerver = TLS1_VERSION, |
| 391 | .want_maxver = TLS1_VERSION, | 391 | .want_maxver = 0, |
| 392 | }, | 392 | }, |
| 393 | { | 393 | { |
| 394 | .ssl_method = TLSv1_method, | 394 | .ssl_method = TLSv1_method, |
| @@ -404,7 +404,7 @@ static struct shared_version_test shared_version_tests[] = { | |||
| 404 | .minver = TLS1_VERSION, | 404 | .minver = TLS1_VERSION, |
| 405 | .maxver = TLS1_2_VERSION, | 405 | .maxver = TLS1_2_VERSION, |
| 406 | .peerver = TLS1_1_VERSION, | 406 | .peerver = TLS1_1_VERSION, |
| 407 | .want_maxver = TLS1_1_VERSION, | 407 | .want_maxver = 0, |
| 408 | }, | 408 | }, |
| 409 | { | 409 | { |
| 410 | .ssl_method = DTLS_method, | 410 | .ssl_method = DTLS_method, |
| @@ -412,7 +412,7 @@ static struct shared_version_test shared_version_tests[] = { | |||
| 412 | .minver = TLS1_1_VERSION, | 412 | .minver = TLS1_1_VERSION, |
| 413 | .maxver = TLS1_2_VERSION, | 413 | .maxver = TLS1_2_VERSION, |
| 414 | .peerver = DTLS1_VERSION, | 414 | .peerver = DTLS1_VERSION, |
| 415 | .want_maxver = DTLS1_VERSION, | 415 | .want_maxver = 0, |
| 416 | }, | 416 | }, |
| 417 | { | 417 | { |
| 418 | .ssl_method = DTLS_method, | 418 | .ssl_method = DTLS_method, |
| @@ -436,7 +436,7 @@ static struct shared_version_test shared_version_tests[] = { | |||
| 436 | .minver = TLS1_1_VERSION, | 436 | .minver = TLS1_1_VERSION, |
| 437 | .maxver = TLS1_1_VERSION, | 437 | .maxver = TLS1_1_VERSION, |
| 438 | .peerver = DTLS1_2_VERSION, | 438 | .peerver = DTLS1_2_VERSION, |
| 439 | .want_maxver = DTLS1_VERSION, | 439 | .want_maxver = 0, |
| 440 | }, | 440 | }, |
| 441 | { | 441 | { |
| 442 | .ssl_method = DTLSv1_2_method, | 442 | .ssl_method = DTLSv1_2_method, |
| @@ -476,7 +476,7 @@ static struct shared_version_test shared_version_tests[] = { | |||
| 476 | .minver = TLS1_1_VERSION, | 476 | .minver = TLS1_1_VERSION, |
| 477 | .maxver = TLS1_2_VERSION, | 477 | .maxver = TLS1_2_VERSION, |
| 478 | .peerver = DTLS1_2_VERSION, | 478 | .peerver = DTLS1_2_VERSION, |
| 479 | .want_maxver = DTLS1_VERSION, | 479 | .want_maxver = 0, |
| 480 | }, | 480 | }, |
| 481 | }; | 481 | }; |
| 482 | 482 | ||
