diff options
author | tb <> | 2023-07-27 07:01:50 +0000 |
---|---|---|
committer | tb <> | 2023-07-27 07:01:50 +0000 |
commit | 74e29e29a715efa5cc5edec834b19dbf7597aaa3 (patch) | |
tree | 8a5351e84224adbf4a3243b5fee9fa42d7a4121b /src/usr.bin/openssl/version.c | |
parent | c9ae1f3a7087667216308d69c572449f42a3570e (diff) | |
download | openbsd-74e29e29a715efa5cc5edec834b19dbf7597aaa3.tar.gz openbsd-74e29e29a715efa5cc5edec834b19dbf7597aaa3.tar.bz2 openbsd-74e29e29a715efa5cc5edec834b19dbf7597aaa3.zip |
Remove antiquated options output
This is uninteresting and rather meaningless except for the implementer.
No need to have several hundred lines of code backing half a dozen symbols
in the public API for this.
ok jsing
Diffstat (limited to 'src/usr.bin/openssl/version.c')
-rw-r--r-- | src/usr.bin/openssl/version.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/src/usr.bin/openssl/version.c b/src/usr.bin/openssl/version.c index 6ff1860ead..991e213b82 100644 --- a/src/usr.bin/openssl/version.c +++ b/src/usr.bin/openssl/version.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: version.c,v 1.11 2023/03/06 14:32:06 tb Exp $ */ | 1 | /* $OpenBSD: version.c,v 1.12 2023/07/27 07:01:50 tb 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 | * |
@@ -184,7 +184,6 @@ static const struct option version_options[] = { | |||
184 | }, | 184 | }, |
185 | { | 185 | { |
186 | .name = "o", | 186 | .name = "o", |
187 | .desc = "Option information", | ||
188 | .type = OPTION_FLAG, | 187 | .type = OPTION_FLAG, |
189 | .opt.flag = &cfg.options, | 188 | .opt.flag = &cfg.options, |
190 | }, | 189 | }, |
@@ -206,7 +205,7 @@ static const struct option version_options[] = { | |||
206 | static void | 205 | static void |
207 | version_usage(void) | 206 | version_usage(void) |
208 | { | 207 | { |
209 | fprintf(stderr, "usage: version [-abdfopv]\n"); | 208 | fprintf(stderr, "usage: version [-abdfpv]\n"); |
210 | options_usage(version_options); | 209 | options_usage(version_options); |
211 | } | 210 | } |
212 | 211 | ||
@@ -241,23 +240,6 @@ version_main(int argc, char **argv) | |||
241 | printf("%s\n", SSLeay_version(SSLEAY_BUILT_ON)); | 240 | printf("%s\n", SSLeay_version(SSLEAY_BUILT_ON)); |
242 | if (cfg.platform) | 241 | if (cfg.platform) |
243 | printf("%s\n", SSLeay_version(SSLEAY_PLATFORM)); | 242 | printf("%s\n", SSLeay_version(SSLEAY_PLATFORM)); |
244 | if (cfg.options) { | ||
245 | printf("options: "); | ||
246 | printf("%s ", BN_options()); | ||
247 | #ifndef OPENSSL_NO_RC4 | ||
248 | printf("%s ", RC4_options()); | ||
249 | #endif | ||
250 | #ifndef OPENSSL_NO_DES | ||
251 | printf("%s ", DES_options()); | ||
252 | #endif | ||
253 | #ifndef OPENSSL_NO_IDEA | ||
254 | printf("%s ", idea_options()); | ||
255 | #endif | ||
256 | #ifndef OPENSSL_NO_BF | ||
257 | printf("%s ", BF_options()); | ||
258 | #endif | ||
259 | printf("\n"); | ||
260 | } | ||
261 | if (cfg.cflags) | 243 | if (cfg.cflags) |
262 | printf("%s\n", SSLeay_version(SSLEAY_CFLAGS)); | 244 | printf("%s\n", SSLeay_version(SSLEAY_CFLAGS)); |
263 | if (cfg.dir) | 245 | if (cfg.dir) |