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

openssh: refer to OpenSSL not SSLeay

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.

Obtained from:	OpenSSH-portable a65784c9f9c5
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Ed Maste 2020-07-15 15:35:26 +00:00
parent af84ca2603
commit 6471c6bd75
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, debug("sshd version %s, %s", SSH_VERSION,
#ifdef WITH_OPENSSL #ifdef WITH_OPENSSL
SSLeay_version(SSLEAY_VERSION) OpenSSL_version(SSLEAY_VERSION)
#else #else
"without OpenSSL" "without OpenSSL"
#endif #endif

2
crypto/openssh/version.h
View File

@ -9,7 +9,7 @@
#define SSH_VERSION_FREEBSD "FreeBSD-20200214" #define SSH_VERSION_FREEBSD "FreeBSD-20200214"
#ifdef WITH_OPENSSL #ifdef WITH_OPENSSL
#define OPENSSL_VERSION_STRING SSLeay_version(SSLEAY_VERSION) #define OPENSSL_VERSION_STRING OpenSSL_version(SSLEAY_VERSION)
#else #else
#define OPENSSL_VERSION_STRING "without OpenSSL" #define OPENSSL_VERSION_STRING "without OpenSSL"
#endif #endif