From: Andy Polyakov <appro@openssl.org>
Date: Thu, 26 Apr 2018 17:22:04 +0000 (+0200)
Subject: Configurations/10-main.conf: force no-engine on ios targets.
X-Git-Tag: OpenSSL_1_1_1-pre6~4
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7069eaee23a1e34727b632171346112563306819;p=oweals%2Fopenssl.git

Configurations/10-main.conf: force no-engine on ios targets.

Rationale for enforcing no-engine is because of disconnect between
compile-time config and run-time, which is a per-application sandbox
directory which one can't predict in advance. Besides, none of the
bundled engines actually give an edge on iOS...

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6106)
---

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index cb3e05e64c..8d55ad84f9 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1592,6 +1592,7 @@ my %targets = (
         inherit_from     => [ "darwin-common" ],
         cflags           => add("-isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common"),
         sys_id           => "iOS",
+        disable          => [ "engine" ],
     },
     "ios-cross" => {
         inherit_from     => [ "darwin-common", asm("armv4_asm") ],
@@ -1601,6 +1602,7 @@ my %targets = (
         cflags           => add("-arch armv7 -mios-version-min=6.0.0 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common"),
         sys_id           => "iOS",
         perlasm_scheme   => "ios32",
+        disable          => [ "engine" ],
     },
     "ios64-cross" => {
         inherit_from     => [ "darwin-common", asm("aarch64_asm") ],
@@ -1608,6 +1610,7 @@ my %targets = (
         sys_id           => "iOS",
         bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
         perlasm_scheme   => "ios64",
+        disable          => [ "engine" ],
     },
 
 ##### GNU Hurd