Author: emaste
Date: Wed Jul 15 15:35:26 2020
New Revision: 363225
URL: https://svnweb.freebsd.org/changeset/base/363225
Log:
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
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 14:38:15 2020 (r363224)
+++ head/crypto/openssh/sshd.c Wed Jul 15 15:35:26 2020 (r363225)
@@ -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(SSLEAY_VERSION)
#else
"without OpenSSL"
#endif
Modified: head/crypto/openssh/version.h
==============================================================================
--- head/crypto/openssh/version.h Wed Jul 15 14:38:15 2020
(r363224)
+++ head/crypto/openssh/version.h Wed Jul 15 15:35:26 2020
(r363225)
@@ -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(SSLEAY_VERSION)
#else
#define OPENSSL_VERSION_STRING "without OpenSSL"
#endif
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
