mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-13 10:02:38 +00:00
openssh: rename local macro to avoid OpenSSL 1.1.1 conflict
Local changes introduced an OPENSSH_VERSION macro, but this conflicts with a macro of the same name introduced with OpenSSL 1.1.1.
This commit is contained in:
parent
6bd321e62b
commit
5d5f8b31cb
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/projects/openssl111/; revision=338805
@ -811,10 +811,10 @@ main(int ac, char **av)
|
||||
*options.version_addendum != '\0')
|
||||
fprintf(stderr, "%s %s, %s\n", SSH_RELEASE,
|
||||
options.version_addendum,
|
||||
OPENSSL_VERSION);
|
||||
OPENSSL_VERSION_STRING);
|
||||
else
|
||||
fprintf(stderr, "%s, %s\n", SSH_RELEASE,
|
||||
OPENSSL_VERSION);
|
||||
OPENSSL_VERSION_STRING);
|
||||
if (opt == 'V')
|
||||
exit(0);
|
||||
break;
|
||||
@ -1078,7 +1078,7 @@ main(int ac, char **av)
|
||||
|
||||
if (debug_flag)
|
||||
/* version_addendum is always NULL at this point */
|
||||
logit("%s, %s", SSH_RELEASE, OPENSSL_VERSION);
|
||||
logit("%s, %s", SSH_RELEASE, OPENSSL_VERSION_STRING);
|
||||
|
||||
/* Parse the configuration files */
|
||||
process_config_files(host_arg, pw, 0);
|
||||
|
@ -939,10 +939,10 @@ usage(void)
|
||||
if (options.version_addendum && *options.version_addendum != '\0')
|
||||
fprintf(stderr, "%s %s, %s\n",
|
||||
SSH_RELEASE,
|
||||
options.version_addendum, OPENSSL_VERSION);
|
||||
options.version_addendum, OPENSSL_VERSION_STRING);
|
||||
else
|
||||
fprintf(stderr, "%s, %s\n",
|
||||
SSH_RELEASE, OPENSSL_VERSION);
|
||||
SSH_RELEASE, OPENSSL_VERSION_STRING);
|
||||
fprintf(stderr,
|
||||
"usage: sshd [-46DdeiqTt] [-C connection_spec] [-c host_cert_file]\n"
|
||||
" [-E log_file] [-f config_file] [-g login_grace_time]\n"
|
||||
|
@ -9,7 +9,7 @@
|
||||
#define SSH_VERSION_FREEBSD "FreeBSD-20180909"
|
||||
|
||||
#ifdef WITH_OPENSSL
|
||||
#define OPENSSL_VERSION SSLeay_version(SSLEAY_VERSION)
|
||||
#define OPENSSL_VERSION_STRING SSLeay_version(SSLEAY_VERSION)
|
||||
#else
|
||||
#define OPENSSL_VERSION "without OpenSSL"
|
||||
#define OPENSSL_VERSION_STRING "without OpenSSL"
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user