diff options
author | Tomas Mraz <tomas@openssl.org> | 2023-01-25 16:32:02 +0100 |
---|---|---|
committer | Pauli <pauli@openssl.org> | 2023-01-31 11:10:59 +1100 |
commit | 58e8162e73d9061bd056f041bf07a1573d202d7a (patch) | |
tree | 1929ce7d9532f0985129fa2ceb4e8418fe0fe1d3 /crypto/des | |
parent | c122d15039ac94e98bc6cd903c78f4696144d1e0 (diff) |
Avoid duplicating symbols in legacy.a with some build options
If no-module or no-shared is used, the symbols from
libcrypto should not be duplicated in legacy.a
Also the BIGNUM functions are currently not needed
in legacy.a at all.
Fixes #20124
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20137)
(cherry picked from commit f6a6f7b6aa84dab44384780cb77050d15c5f575e)
Diffstat (limited to 'crypto/des')
-rw-r--r-- | crypto/des/build.info | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/des/build.info b/crypto/des/build.info index 4284272cfa..5a13e4f9be 100644 --- a/crypto/des/build.info +++ b/crypto/des/build.info @@ -23,11 +23,12 @@ $ALL=$COMMON\ SOURCE[../../libcrypto]=$ALL $DESASM SOURCE[../../providers/libfips.a]=$COMMON $DESASM -SOURCE[../../providers/liblegacy.a]=$DESASM +IF[{- !$disabled{module} && !$disabled{shared} -}] + SOURCE[../../providers/liblegacy.a]=$DESASM +ENDIF DEFINE[../../libcrypto]=$DESDEF DEFINE[../../providers/libfips.a]=$DESDEF -DEFINE[../../providers/liblegacy.a]=$DESDEF # When all deprecated symbols are removed, libcrypto doesn't export the # DES functions, so we must include them directly in liblegacy.a |