[openssl] master update

[beldmit at gmail.com]

The branch master has been updated
       via  aa58071e4b8b245db1564f476731c978738e7e98 (commit)
      from  e07102220afe4059bc45aa3d7073b7678329e26e (commit)


- Log -----------------------------------------------------------------
commit aa58071e4b8b245db1564f476731c978738e7e98
Author: Dominic Letz <dominic at diode.io>
Date:   Wed Sep 22 18:03:28 2021 +0200

    Update 15-ios.conf
    
    CLA: trivial
    
    I assume this has been an error in the initial ios conf file. In order to build for ios the shared engine library, needs to be disabled because iOS doesn't have the concept of shared libraries. But instead of only disabling `dynamic-engine` (or like in this commit disabled the `shared`) option the previous config did disable `engine` and with that the `static-engine` compilation as well. This restores the `static-engine` option being enabled by default, but keeping compilation going on iOS.
    
    Cheers!
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Dmitry Belyavskiy <beldmit at gmail.com>
    (Merged from https://github.com/openssl/openssl/pull/16659)

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

Summary of changes:
 Configurations/15-ios.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Configurations/15-ios.conf b/Configurations/15-ios.conf
index 4b5aeecc28..54d37f63f4 100644
--- a/Configurations/15-ios.conf
+++ b/Configurations/15-ios.conf
@@ -10,7 +10,7 @@ my %targets = (
         template         => 1,
         inherit_from     => [ "darwin-common" ],
         sys_id           => "iOS",
-        disable          => [ "engine", "async" ],
+        disable          => [ "shared", "async" ],
     },
     "ios-xcrun" => {
         inherit_from     => [ "ios-common" ],