git: e77af69d0d43 - stable/12 - openssh: refer to OpenSSL not SSLeay

[Ed Maste]

The branch stable/12 has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=e77af69d0d4373cdea6d174109ac82e2fac154be

commit e77af69d0d4373cdea6d174109ac82e2fac154be
Author:     Ed Maste <emaste at FreeBSD.org>
AuthorDate: 2020-07-15 15:35:26 +0000
Commit:     Ed Maste <emaste at FreeBSD.org>
CommitDate: 2021-02-17 19:23:20 +0000

    openssh: refer to OpenSSL not SSLeay
    
    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.
    
    Obtained from:  OpenSSH-portable a65784c9f9c5
    Sponsored by:   The FreeBSD Foundation
    
    (cherry picked from commit 6471c6bd75af57acde7dc39f5202d9a7adf4130a)
    
    openssh: refer to OpenSSL not SSLeay, part 2
    
    (cherry picked from commit ea64ebd08c80e4c0a7b8ed207caba45e9374908e)
---
 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 39ad3dcbcf9c..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
-	    SSLeay_version(SSLEAY_VERSION)
+	    OpenSSL_version(OPENSSL_VERSION)
 #else
 	    "without OpenSSL"
 #endif
diff --git a/crypto/openssh/version.h b/crypto/openssh/version.h
index c4df47dde8cf..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	SSLeay_version(SSLEAY_VERSION)
+#define OPENSSL_VERSION_STRING	OpenSSL_version(OPENSSL_VERSION)
 #else
 #define OPENSSL_VERSION_STRING	"without OpenSSL"
 #endif