svn commit: r363235 - head/crypto/openssh

[Ed Maste]

Author: emaste
Date: Wed Jul 15 18:49:00 2020
New Revision: 363235
URL: https://svnweb.freebsd.org/changeset/base/363235

Log:
  openssh: refer to OpenSSL not SSLeay, part 2
  
  This change was made upstream between 7.9p1 and 8.0p1.  We've made local
  changes in the same places for handling the version_addendum; apply the
  SSLeay_version to OpenSSL_version change in advance of importing 8.0p1.
  This should have been part of r363225.
  
  Obtained from:	OpenSSH-portable a65784c9f9c5
  MFC with:	r363225
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/crypto/openssh/sshd.c
  head/crypto/openssh/version.h

Modified: head/crypto/openssh/sshd.c
==============================================================================
--- head/crypto/openssh/sshd.c	Wed Jul 15 18:32:09 2020	(r363234)
+++ head/crypto/openssh/sshd.c	Wed Jul 15 18:49:00 2020	(r363235)
@@ -1749,7 +1749,7 @@ main(int ac, char **av)
 
 	debug("sshd version %s, %s", SSH_VERSION,
 #ifdef WITH_OPENSSL
-	    OpenSSL_version(SSLEAY_VERSION)
+	    OpenSSL_version(OPENSSL_VERSION)
 #else
 	    "without OpenSSL"
 #endif

Modified: head/crypto/openssh/version.h
==============================================================================
--- head/crypto/openssh/version.h	Wed Jul 15 18:32:09 2020	(r363234)
+++ head/crypto/openssh/version.h	Wed Jul 15 18:49:00 2020	(r363235)
@@ -9,7 +9,7 @@
 #define SSH_VERSION_FREEBSD	"FreeBSD-20200214"
 
 #ifdef WITH_OPENSSL
-#define OPENSSL_VERSION_STRING	OpenSSL_version(SSLEAY_VERSION)
+#define OPENSSL_VERSION_STRING	OpenSSL_version(OPENSSL_VERSION)
 #else
 #define OPENSSL_VERSION_STRING	"without OpenSSL"
 #endif