svn commit: r339285 - stable/11/crypto/openssh

[Ed Maste]

Author: emaste
Date: Wed Oct 10 15:38:33 2018
New Revision: 339285
URL: https://svnweb.freebsd.org/changeset/base/339285

Log:
  MFC r338810: 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
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/11/crypto/openssh/ssh.c
  stable/11/crypto/openssh/sshd.c
  stable/11/crypto/openssh/version.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/crypto/openssh/ssh.c
==============================================================================
--- stable/11/crypto/openssh/ssh.c	Wed Oct 10 15:37:10 2018	(r339284)
+++ stable/11/crypto/openssh/ssh.c	Wed Oct 10 15:38:33 2018	(r339285)
@@ -765,10 +765,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;
@@ -1013,7 +1013,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: stable/11/crypto/openssh/sshd.c
==============================================================================
--- stable/11/crypto/openssh/sshd.c	Wed Oct 10 15:37:10 2018	(r339284)
+++ stable/11/crypto/openssh/sshd.c	Wed Oct 10 15:38:33 2018	(r339285)
@@ -924,10 +924,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: stable/11/crypto/openssh/version.h
==============================================================================
--- stable/11/crypto/openssh/version.h	Wed Oct 10 15:37:10 2018	(r339284)
+++ stable/11/crypto/openssh/version.h	Wed Oct 10 15:38:33 2018	(r339285)
@@ -9,7 +9,7 @@
 #define SSH_VERSION_FREEBSD	"FreeBSD-20170903"
 
 #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