diff options
author | tb <> | 2024-12-11 12:18:05 +0000 |
---|---|---|
committer | tb <> | 2024-12-11 12:18:05 +0000 |
commit | 529658b69d635a230df11f8a8a30f0c9d8fe14bd (patch) | |
tree | ae0e08ca6cd8e4c5e48753955934e3439c03023c /src | |
parent | 9b082e3d93019c6ea59a61073a6eba48ace641b8 (diff) | |
download | openbsd-529658b69d635a230df11f8a8a30f0c9d8fe14bd.tar.gz openbsd-529658b69d635a230df11f8a8a30f0c9d8fe14bd.tar.bz2 openbsd-529658b69d635a230df11f8a8a30f0c9d8fe14bd.zip |
ciphers: remove tls1 and tls1_1 leftovers
The options were already removed from the manual in 91e7614a.
From Renaud Allard (hand-applied since patch was mangled)
Diffstat (limited to 'src')
-rw-r--r-- | src/usr.bin/openssl/ciphers.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/usr.bin/openssl/ciphers.c b/src/usr.bin/openssl/ciphers.c index 247929bb9e..3478df910e 100644 --- a/src/usr.bin/openssl/ciphers.c +++ b/src/usr.bin/openssl/ciphers.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ciphers.c,v 1.18 2023/03/06 14:32:05 tb Exp $ */ | 1 | /* $OpenBSD: ciphers.c,v 1.19 2024/12/11 12:18:05 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -49,20 +49,6 @@ static const struct option ciphers_options[] = { | |||
49 | .opt.flag = &cfg.use_supported, | 49 | .opt.flag = &cfg.use_supported, |
50 | }, | 50 | }, |
51 | { | 51 | { |
52 | .name = "tls1", | ||
53 | .desc = "Use TLS protocol version 1", | ||
54 | .type = OPTION_VALUE, | ||
55 | .opt.value = &cfg.version, | ||
56 | .value = TLS1_VERSION, | ||
57 | }, | ||
58 | { | ||
59 | .name = "tls1_1", | ||
60 | .desc = "Use TLS protocol version 1.1", | ||
61 | .type = OPTION_VALUE, | ||
62 | .opt.value = &cfg.version, | ||
63 | .value = TLS1_1_VERSION, | ||
64 | }, | ||
65 | { | ||
66 | .name = "tls1_2", | 52 | .name = "tls1_2", |
67 | .desc = "Use TLS protocol version 1.2", | 53 | .desc = "Use TLS protocol version 1.2", |
68 | .type = OPTION_VALUE, | 54 | .type = OPTION_VALUE, |
@@ -96,7 +82,7 @@ static const struct option ciphers_options[] = { | |||
96 | static void | 82 | static void |
97 | ciphers_usage(void) | 83 | ciphers_usage(void) |
98 | { | 84 | { |
99 | fprintf(stderr, "usage: ciphers [-hsVv] [-tls1] [-tls1_1] [-tls1_2] " | 85 | fprintf(stderr, "usage: ciphers [-hsVv] [-tls1_2] " |
100 | "[-tls1_3] [cipherlist]\n"); | 86 | "[-tls1_3] [cipherlist]\n"); |
101 | options_usage(ciphers_options); | 87 | options_usage(ciphers_options); |
102 | } | 88 | } |