Commit 6e24fe61 authored by Ed Maste's avatar Ed Maste
Browse files

ssh: use upstream SSH_OPENSSL_VERSION macro

With the upgrade to OpenSSH 6.7p1 in commit a0ee8cc6 we replaced
WITH_OPENSSL ifdefs with an OPENSSL_VERSION macro, later changing it
to OPENSSL_VERSION_STRING.

A few years later OpenSSH made an equivalent change (with a different
macro name), in commit 4d94b031ff88.  Switch to the macro name they
chose.

MFC after:	1 week
Sponsored by:	The FreeBSD Foundation
parent 525d1e20
......@@ -876,10 +876,10 @@ main(int ac, char **av)
*options.version_addendum != '\0')
fprintf(stderr, "%s %s, %s\n", SSH_RELEASE,
options.version_addendum,
OPENSSL_VERSION_STRING);
SSH_OPENSSL_VERSION);
else
fprintf(stderr, "%s, %s\n", SSH_RELEASE,
OPENSSL_VERSION_STRING);
SSH_OPENSSL_VERSION);
if (opt == 'V')
exit(0);
break;
......@@ -1147,7 +1147,7 @@ main(int ac, char **av)
if (debug_flag)
/* version_addendum is always NULL at this point */
logit("%s, %s", SSH_RELEASE, OPENSSL_VERSION_STRING);
logit("%s, %s", SSH_RELEASE, SSH_OPENSSL_VERSION);
/* Parse the configuration files */
process_config_files(host_arg, pw, 0, &want_final_pass);
......
......@@ -923,10 +923,10 @@ usage(void)
*options.version_addendum != '\0')
fprintf(stderr, "%s %s, %s\n",
SSH_RELEASE,
options.version_addendum, OPENSSL_VERSION_STRING);
options.version_addendum, SSH_OPENSSL_VERSION);
else
fprintf(stderr, "%s, %s\n",
SSH_RELEASE, OPENSSL_VERSION_STRING);
SSH_RELEASE, SSH_OPENSSL_VERSION);
fprintf(stderr,
"usage: sshd [-46DdeiqTt] [-C connection_spec] [-c host_cert_file]\n"
" [-E log_file] [-f config_file] [-g login_grace_time]\n"
......
......@@ -6,9 +6,3 @@
#define SSH_RELEASE SSH_VERSION SSH_PORTABLE
#define SSH_VERSION_FREEBSD "FreeBSD-20220415"
#ifdef WITH_OPENSSL
#define OPENSSL_VERSION_STRING OpenSSL_version(OPENSSL_VERSION)
#else
#define OPENSSL_VERSION_STRING "without OpenSSL"
#endif
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment