d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openssh: refer to OpenSSL not SSLeay, part 2

Browse Source 
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
This commit is contained in:
Ed Maste 2020-07-15 18:49:00 +00:00
parent dceff013b2
commit ea64ebd08c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=363235
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/openssh/sshd.c
View File

@ -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

2
crypto/openssh/version.h
View File

@ -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