diff options
| author | Tomas Mraz <tmraz@fedoraproject.org> | 2020-04-14 12:16:22 +0200 |
|---|---|---|
| committer | Tomas Mraz <tmraz@fedoraproject.org> | 2020-04-15 11:46:00 +0200 |
| commit | ca59b00bbd701b9e5e7ce213f44a4d7577d6d2db (patch) | |
| tree | 9a04113b5e5124c156634b3a332a1c1e91ac9b40 | |
| parent | EVP: fix memleak in evp_pkey_downgrade() (diff) | |
| download | openssl-ca59b00bbd701b9e5e7ce213f44a4d7577d6d2db.tar.xz openssl-ca59b00bbd701b9e5e7ce213f44a4d7577d6d2db.zip | |
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@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11544)
| -rw-r--r-- | providers/implementations/ciphers/build.info | 6 |
1 files changed, 5 insertions, 1 deletions
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} -}] |