[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  104f85c62886e25188a71d1e498e553abedbf78c (commit)
      from  4b1aa164990a29db4a25b9478cc0066fe1ac9810 (commit)


- Log -----------------------------------------------------------------
commit 104f85c62886e25188a71d1e498e553abedbf78c
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Feb 12 09:19:41 2020 +0000

    Fix no-ec build
    
    Don't attempt to build ecx related source files in a "no-ec" build.
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/11065)

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

Summary of changes:
 providers/implementations/exchange/build.info | 7 ++++---
 providers/implementations/keymgmt/build.info  | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/providers/implementations/exchange/build.info b/providers/implementations/exchange/build.info
index c74e122844..51d32fc090 100644
--- a/providers/implementations/exchange/build.info
+++ b/providers/implementations/exchange/build.info
@@ -18,6 +18,7 @@ IF[{- !$disabled{asm} -}]
   ENDIF
 ENDIF
 
-
-SOURCE[$ECX_GOAL]=ecx_exch.c
-DEFINE[$ECX_GOAL]=$ECDEF
+IF[{- !$disabled{ec} -}]
+  SOURCE[$ECX_GOAL]=ecx_exch.c
+  DEFINE[$ECX_GOAL]=$ECDEF
+ENDIF
diff --git a/providers/implementations/keymgmt/build.info b/providers/implementations/keymgmt/build.info
index 2a79b39b33..1e4146d15a 100644
--- a/providers/implementations/keymgmt/build.info
+++ b/providers/implementations/keymgmt/build.info
@@ -13,4 +13,6 @@ IF[{- !$disabled{dsa} -}]
   SOURCE[$DSA_GOAL]=dsa_kmgmt.c
 ENDIF
 SOURCE[$RSA_GOAL]=rsa_kmgmt.c
-SOURCE[$ECX_GOAL]=ecx_kmgmt.c
+IF[{- !$disabled{ec} -}]
+  SOURCE[$ECX_GOAL]=ecx_kmgmt.c
+ENDIF