diff options
| author | tb <> | 2023-02-01 14:39:09 +0000 |
|---|---|---|
| committer | tb <> | 2023-02-01 14:39:09 +0000 |
| commit | 17e85e0d750477ecd6d94c4da3d089193c536e8f (patch) | |
| tree | 551c73b209e1ac3dd50d2eeccbd49b3e2c8439d4 /src/regress/lib/libssl/interop/server.c | |
| parent | b61138a80d35fdd79351118cad4aab84c64fe570 (diff) | |
| download | openbsd-17e85e0d750477ecd6d94c4da3d089193c536e8f.tar.gz openbsd-17e85e0d750477ecd6d94c4da3d089193c536e8f.tar.bz2 openbsd-17e85e0d750477ecd6d94c4da3d089193c536e8f.zip | |
Retire OpenSSL 1.0.2 interop
Now that the OpenSSL 1.0.2 port is gone, there's no need to keep the
interop tests anymore. anton's and bluhm's regress tests will switch
to testing interoperability with OpenSSL 3.0.
Diffstat (limited to 'src/regress/lib/libssl/interop/server.c')
| -rw-r--r-- | src/regress/lib/libssl/interop/server.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/regress/lib/libssl/interop/server.c b/src/regress/lib/libssl/interop/server.c index c8e4cb7fc3..a634adb43b 100644 --- a/src/regress/lib/libssl/interop/server.c +++ b/src/regress/lib/libssl/interop/server.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: server.c,v 1.11 2022/07/07 13:12:57 tb Exp $ */ | 1 | /* $OpenBSD: server.c,v 1.12 2023/02/01 14:39:09 tb Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2018-2019 Alexander Bluhm <bluhm@openbsd.org> | 3 | * Copyright (c) 2018-2019 Alexander Bluhm <bluhm@openbsd.org> |
| 4 | * | 4 | * |
| @@ -85,10 +85,8 @@ main(int argc, char *argv[]) | |||
| 85 | version = TLS1_1_VERSION; | 85 | version = TLS1_1_VERSION; |
| 86 | } else if (strcmp(optarg, "TLS1_2") == 0) { | 86 | } else if (strcmp(optarg, "TLS1_2") == 0) { |
| 87 | version = TLS1_2_VERSION; | 87 | version = TLS1_2_VERSION; |
| 88 | #ifdef TLS1_3_VERSION | ||
| 89 | } else if (strcmp(optarg, "TLS1_3") == 0) { | 88 | } else if (strcmp(optarg, "TLS1_3") == 0) { |
| 90 | version = TLS1_3_VERSION; | 89 | version = TLS1_3_VERSION; |
| 91 | #endif | ||
| 92 | } else { | 90 | } else { |
| 93 | errx(1, "unknown protocol version: %s", optarg); | 91 | errx(1, "unknown protocol version: %s", optarg); |
| 94 | } | 92 | } |
| @@ -184,10 +182,6 @@ main(int argc, char *argv[]) | |||
| 184 | fclose(file); | 182 | fclose(file); |
| 185 | } | 183 | } |
| 186 | 184 | ||
| 187 | /* needed when linking with OpenSSL 1.0.2p */ | ||
| 188 | if (SSL_CTX_set_ecdh_auto(ctx, 1) <= 0) | ||
| 189 | err_ssl(1, "SSL_CTX_set_ecdh_auto"); | ||
| 190 | |||
| 191 | /* load server certificate */ | 185 | /* load server certificate */ |
| 192 | if (SSL_CTX_use_certificate_file(ctx, crt, SSL_FILETYPE_PEM) <= 0) | 186 | if (SSL_CTX_use_certificate_file(ctx, crt, SSL_FILETYPE_PEM) <= 0) |
| 193 | err_ssl(1, "SSL_CTX_use_certificate_file"); | 187 | err_ssl(1, "SSL_CTX_use_certificate_file"); |
| @@ -231,9 +225,6 @@ main(int argc, char *argv[]) | |||
| 231 | if (listciphers) { | 225 | if (listciphers) { |
| 232 | STACK_OF(SSL_CIPHER) *supported_ciphers; | 226 | STACK_OF(SSL_CIPHER) *supported_ciphers; |
| 233 | 227 | ||
| 234 | #if OPENSSL_VERSION_NUMBER < 0x1010000f | ||
| 235 | #define SSL_get1_supported_ciphers SSL_get_ciphers | ||
| 236 | #endif | ||
| 237 | ssl = SSL_new(ctx); | 228 | ssl = SSL_new(ctx); |
| 238 | if (ssl == NULL) | 229 | if (ssl == NULL) |
| 239 | err_ssl(1, "SSL_new"); | 230 | err_ssl(1, "SSL_new"); |
| @@ -242,9 +233,7 @@ main(int argc, char *argv[]) | |||
| 242 | err_ssl(1, "SSL_get1_supported_ciphers"); | 233 | err_ssl(1, "SSL_get1_supported_ciphers"); |
| 243 | print_ciphers(supported_ciphers); | 234 | print_ciphers(supported_ciphers); |
| 244 | 235 | ||
| 245 | #if OPENSSL_VERSION_NUMBER >= 0x1010000f | ||
| 246 | sk_SSL_CIPHER_free(supported_ciphers); | 236 | sk_SSL_CIPHER_free(supported_ciphers); |
| 247 | #endif | ||
| 248 | return 0; | 237 | return 0; |
| 249 | } | 238 | } |
| 250 | 239 | ||
