Author: emaste
Date: Wed Sep 19 20:52:47 2018
New Revision: 338810
URL: https://svnweb.freebsd.org/changeset/base/338810
Log:
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 OepnsSL 1.1.1
Reviewed by: des
Approved by: re (gjb)
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
Modified:
head/crypto/openssh/ssh.c
head/crypto/openssh/sshd.c
head/crypto/openssh/version.h
Modified: head/crypto/openssh/ssh.c
==============================================================================
--- head/crypto/openssh/ssh.c Wed Sep 19 19:54:13 2018 (r338809)
+++ head/crypto/openssh/ssh.c Wed Sep 19 20:52:47 2018 (r338810)
@@ -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);
Modified: head/crypto/openssh/sshd.c
==============================================================================
--- head/crypto/openssh/sshd.c Wed Sep 19 19:54:13 2018 (r338809)
+++ head/crypto/openssh/sshd.c Wed Sep 19 20:52:47 2018 (r338810)
@@ -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"
Modified: head/crypto/openssh/version.h
==============================================================================
--- head/crypto/openssh/version.h Wed Sep 19 19:54:13 2018
(r338809)
+++ head/crypto/openssh/version.h Wed Sep 19 20:52:47 2018
(r338810)
@@ -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
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
