[PATCH] openssl-compat: Add version compatibility for SSLeay and friends

Rosen Penev rosenp at gmail.com
Tue Oct 23 09:37:46 AEDT 2018


Building OpenSSH without deprecated APIs compiled causes it to fail.

Signed-off-by: Rosen Penev <rosenp at gmail.com>
---
 openbsd-compat/openssl-compat.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h
index 9e0264c0..b4f0908f 100644
--- a/openbsd-compat/openssl-compat.h
+++ b/openbsd-compat/openssl-compat.h
@@ -87,6 +87,13 @@ void ssh_aes_ctr_iv(EVP_CIPHER_CTX *, int, u_char *, size_t);
  */
 #ifndef SSH_DONT_OVERLOAD_OPENSSL_FUNCS
 
+/* OpenSSL >= 1.1.0 without deprecated APIs needs this.*/
+#ifndef SSLEAY_VERSION
+# define SSLEAY_VERSION OPENSSL_VERSION
+# define SSLeay_version OpenSSL_version
+# define SSLeay         OpenSSL_version_num
+#endif
+
 # ifdef USE_OPENSSL_ENGINE
 #  ifdef OpenSSL_add_all_algorithms
 #   undef OpenSSL_add_all_algorithms
-- 
2.19.1



More information about the openssh-unix-dev mailing list