[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  06444da464c038d7869908aaa26eaa728ae3a032 (commit)
       via  7069eaee23a1e34727b632171346112563306819 (commit)
      from  bf7ae7500073f85fed8a82c4f8ec981d44a8c3d6 (commit)


- Log -----------------------------------------------------------------
commit 06444da464c038d7869908aaa26eaa728ae3a032
Author: Andy Polyakov <appro at openssl.org>
Date:   Thu Apr 26 19:22:30 2018 +0200

    Configurations/unix-Makefile.tmpl: harmonize with no-engine.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6106)

commit 7069eaee23a1e34727b632171346112563306819
Author: Andy Polyakov <appro at openssl.org>
Date:   Thu Apr 26 19:22:04 2018 +0200

    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 at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6106)

-----------------------------------------------------------------------

Summary of changes:
 Configurations/10-main.conf       | 3 +++
 Configurations/unix-Makefile.tmpl | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index cb3e05e..8d55ad8 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
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 799eaa8..4451232 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -369,7 +369,7 @@ test: tests
 	  RESULT_D=test-runs \
 	  PERL="$(PERL)" \
 	  EXE_EXT={- $exeext -} \
-	  OPENSSL_ENGINES=`cd ../$(BLDDIR)/engines; pwd` \
+	  OPENSSL_ENGINES=`cd ../$(BLDDIR)/engines 2>/dev/null && pwd` \
 	  OPENSSL_DEBUG_MEMORY=on \
 	    $(PERL) ../$(SRCDIR)/test/run_tests.pl $(TESTS) )
 	@ : {- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -}