From 74e29e29a715efa5cc5edec834b19dbf7597aaa3 Mon Sep 17 00:00:00 2001
From: tb <>
Date: Thu, 27 Jul 2023 07:01:50 +0000
Subject: 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
---
src/usr.bin/openssl/openssl.1 | 8 +++-----
src/usr.bin/openssl/speed.c | 21 ++-------------------
src/usr.bin/openssl/version.c | 22 ++--------------------
3 files changed, 7 insertions(+), 44 deletions(-)
diff --git a/src/usr.bin/openssl/openssl.1 b/src/usr.bin/openssl/openssl.1
index da4c4ffefc..be060a3e54 100644
--- a/src/usr.bin/openssl/openssl.1
+++ b/src/usr.bin/openssl/openssl.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: openssl.1,v 1.151 2023/07/23 11:20:11 tb Exp $
+.\" $OpenBSD: openssl.1,v 1.152 2023/07/27 07:01:50 tb Exp $
.\" ====================================================================
.\" Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved.
.\"
@@ -110,7 +110,7 @@
.\" copied and put under another distribution licence
.\" [including the GNU Public Licence.]
.\"
-.Dd $Mdocdate: July 23 2023 $
+.Dd $Mdocdate: July 27 2023 $
.Dt OPENSSL 1
.Os
.Sh NAME
@@ -6049,7 +6049,7 @@ itself, then 1 for the CA that signed the certificate and so on.
.Tg version
.Sh VERSION
.Nm openssl version
-.Op Fl abdfopv
+.Op Fl abdfpv
.Pp
The
.Nm version
@@ -6069,8 +6069,6 @@ was built.
setting.
.It Fl f
Compilation flags.
-.It Fl o
-Option information: various options set when the library was built.
.It Fl p
Platform setting.
.It Fl v
diff --git a/src/usr.bin/openssl/speed.c b/src/usr.bin/openssl/speed.c
index a1a69c267f..f50d224064 100644
--- a/src/usr.bin/openssl/speed.c
+++ b/src/usr.bin/openssl/speed.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: speed.c,v 1.33 2023/05/20 12:03:02 tb Exp $ */
+/* $OpenBSD: speed.c,v 1.34 2023/07/27 07:01:50 tb Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -1746,24 +1746,7 @@ show_res:
if (!mr) {
fprintf(stdout, "%s\n", SSLeay_version(SSLEAY_VERSION));
fprintf(stdout, "%s\n", SSLeay_version(SSLEAY_BUILT_ON));
- printf("options:");
- printf("%s ", BN_options());
-#ifndef OPENSSL_NO_RC4
- printf("%s ", RC4_options());
-#endif
-#ifndef OPENSSL_NO_DES
- printf("%s ", DES_options());
-#endif
-#ifndef OPENSSL_NO_AES
- printf("%s ", AES_options());
-#endif
-#ifndef OPENSSL_NO_IDEA
- printf("%s ", idea_options());
-#endif
-#ifndef OPENSSL_NO_BF
- printf("%s ", BF_options());
-#endif
- fprintf(stdout, "\n%s\n", SSLeay_version(SSLEAY_CFLAGS));
+ fprintf(stdout, "%s\n", SSLeay_version(SSLEAY_CFLAGS));
}
if (pr_header) {
if (mr)
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 @@
-/* $OpenBSD: version.c,v 1.11 2023/03/06 14:32:06 tb Exp $ */
+/* $OpenBSD: version.c,v 1.12 2023/07/27 07:01:50 tb Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -184,7 +184,6 @@ static const struct option version_options[] = {
},
{
.name = "o",
- .desc = "Option information",
.type = OPTION_FLAG,
.opt.flag = &cfg.options,
},
@@ -206,7 +205,7 @@ static const struct option version_options[] = {
static void
version_usage(void)
{
- fprintf(stderr, "usage: version [-abdfopv]\n");
+ fprintf(stderr, "usage: version [-abdfpv]\n");
options_usage(version_options);
}
@@ -241,23 +240,6 @@ version_main(int argc, char **argv)
printf("%s\n", SSLeay_version(SSLEAY_BUILT_ON));
if (cfg.platform)
printf("%s\n", SSLeay_version(SSLEAY_PLATFORM));
- if (cfg.options) {
- printf("options: ");
- printf("%s ", BN_options());
-#ifndef OPENSSL_NO_RC4
- printf("%s ", RC4_options());
-#endif
-#ifndef OPENSSL_NO_DES
- printf("%s ", DES_options());
-#endif
-#ifndef OPENSSL_NO_IDEA
- printf("%s ", idea_options());
-#endif
-#ifndef OPENSSL_NO_BF
- printf("%s ", BF_options());
-#endif
- printf("\n");
- }
if (cfg.cflags)
printf("%s\n", SSLeay_version(SSLEAY_CFLAGS));
if (cfg.dir)
--
cgit v1.2.3-55-g6feb