[openssh-commits] [openssh] 01/01: Avoid deprecated OPENSSL_config when using 1.1.x

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 4e23deefd7959ef83c73ed9cce574423438f6133
Author: Damien Miller <djm at mindrot.org>
Date:   Tue Oct 16 10:51:52 2018 +1100

    Avoid deprecated OPENSSL_config when using 1.1.x
    
    OpenSSL 1.1.x soft-deprecated OPENSSL_config in favour of
    OPENSSL_init_crypto; pointed out by Jakub Jelen
---
 openbsd-compat/openssl-compat.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/openbsd-compat/openssl-compat.c b/openbsd-compat/openssl-compat.c
index 259fccbe..762358f0 100644
--- a/openbsd-compat/openssl-compat.c
+++ b/openbsd-compat/openssl-compat.c
@@ -75,7 +75,13 @@ ssh_OpenSSL_add_all_algorithms(void)
 	/* Enable use of crypto hardware */
 	ENGINE_load_builtin_engines();
 	ENGINE_register_all_complete();
+
+#if OPENSSL_VERSION_NUMBER < 0x10001000L
 	OPENSSL_config(NULL);
+#else
+	OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS |
+	    OPENSSL_INIT_ADD_ALL_DIGESTS | OPENSSL_INIT_LOAD_CONFIG);
+#endif
 }
 #endif
 

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.