From ea64ebd08c80e4c0a7b8ed207caba45e9374908e Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Wed, 15 Jul 2020 18:49:00 +0000
Subject: [PATCH] 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
---
 crypto/openssh/sshd.c    | 2 +-
 crypto/openssh/version.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/openssh/sshd.c b/crypto/openssh/sshd.c
index 179646491c17..06fa7b8de339 100644
--- a/crypto/openssh/sshd.c
+++ b/crypto/openssh/sshd.c
@@ -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
diff --git a/crypto/openssh/version.h b/crypto/openssh/version.h
index f8bceb1c680e..9dbaf16e7192 100644
--- a/crypto/openssh/version.h
+++ b/crypto/openssh/version.h
@@ -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