openssh unix dev - Oct 2018 - [PATCH] openssl-compat: Add version compatibility for SSLeay and friends

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

On Mon, 22 Oct 2018, Rosen Penev wrote:
> 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
we should probably just replace the use of these with the new names

On Tue, 23 Oct 2018, Damien Miller wrote:
> On Mon, 22 Oct 2018, Rosen Penev wrote:
> 
> > 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
> 
> we should probably just replace the use of these with the new names
I've done this:

commit 859754bdeb41373d372e36b5dc89c547453addb3 (HEAD -> master,
origin/master, origin/HEAD)
Author: Damien Miller <djm at mindrot.org>
Date:   Tue Oct 23 17:10:41 2018 +1100

    remove remaining references to SSLeay
    
    Prompted by Rosen Penev

commit a65784c9f9c5d00cf1a0e235090170abc8d07c73
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Tue Oct 23 05:56:35 2018 +0000

    upstream: refer to OpenSSL not SSLeay;
    
    we're old, but we don't have to act it
    
    OpenBSD-Commit-ID: 9ca38d11f8ed19e61a55108d1e892d696cee08ec