08c5f7cfab
This adds a couple of patches when setting some openssl options: * ECDSA code in openssh-compat.h and libressl-api-compat.c needs to be be guarded by OPENSSL_HAS_ECC; otherwise, it will not build with openssl compiled without ECC support. * Fix openssl version number in openbsd-compat/openssl-compat.c which failed to compile --with-ssl-engine; this option is used when CONFIG_OPENSSL_ENGINE_CRYPTO=y Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com> Signed-off-by: Peter Wagner <tripolar@gmx.at>
20 lines
773 B
Diff
20 lines
773 B
Diff
From edfc2e18ef069ba600c8f4632ce1e3dc94a0669a Mon Sep 17 00:00:00 2001
|
|
From: Eneas U de Queiroz <cote2004-github@yahoo.com>
|
|
Date: Fri, 19 Oct 2018 10:04:24 -0300
|
|
Subject: [PATCH 2/2] Fix OPENSSL_init_crypto call for openssl < 1.1
|
|
|
|
Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
|
|
|
|
diff --git a/openbsd-compat/openssl-compat.c b/openbsd-compat/openssl-compat.c
|
|
index 8b4a3627..590b66d1 100644
|
|
--- a/openbsd-compat/openssl-compat.c
|
|
+++ b/openbsd-compat/openssl-compat.c
|
|
@@ -76,7 +76,7 @@ ssh_OpenSSL_add_all_algorithms(void)
|
|
ENGINE_load_builtin_engines();
|
|
ENGINE_register_all_complete();
|
|
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10001000L
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
OPENSSL_config(NULL);
|
|
#else
|
|
OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS |
|