[openssl] master update

[tmraz at fedoraproject.org]

The branch master has been updated
       via  ca59b00bbd701b9e5e7ce213f44a4d7577d6d2db (commit)
      from  49276c3569656a17c24517ff0781967ced2c9658 (commit)


- Log -----------------------------------------------------------------
commit ca59b00bbd701b9e5e7ce213f44a4d7577d6d2db
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Tue Apr 14 12:16:22 2020 +0200

    Fix no-pic static builds
    
    The cipher_tdes_common causes build failure as being duplicated
    in libcrypto static builds.
    
    [extended tests]
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/11544)

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

Summary of changes:
 providers/implementations/ciphers/build.info | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/providers/implementations/ciphers/build.info b/providers/implementations/ciphers/build.info
index c97008c330..a952c21638 100644
--- a/providers/implementations/ciphers/build.info
+++ b/providers/implementations/ciphers/build.info
@@ -63,8 +63,12 @@ IF[{- !$disabled{des} -}]
       cipher_tdes_default.c cipher_tdes_default_hw.c \
       cipher_tdes_wrap.c cipher_tdes_wrap_hw.c
   SOURCE[$DES_GOAL]=\
-      cipher_desx.c cipher_desx_hw.c cipher_tdes_common.c\
+      cipher_desx.c cipher_desx_hw.c \
       cipher_des.c cipher_des_hw.c
+ IF[{- !$disabled{module} -}]
+   SOURCE[$DES_GOAL]=\
+       cipher_tdes_common.c
+ ENDIF
 ENDIF
 
 IF[{- !$disabled{aria} -}]