diff options
| author | Tomas Mraz <tomas@openssl.org> | 2021-05-05 19:01:44 +0200 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2021-05-12 13:23:33 +0200 |
| commit | 202cbdd2fc37257870eeb61629d8d4d6709df7f1 (patch) | |
| tree | c493a0badd008657b00fcf0e9eaea47cd173e5bd /providers/common | |
| parent | 6a2ab4a9c81c676570e849e474ce64f8c2dee2a9 (diff) | |
A few cleanups of the provider build.infos
Remove a TODO that is no longer relevant and
drop some more non-fips sources from the fips checksums.
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/15191)
Diffstat (limited to 'providers/common')
| -rw-r--r-- | providers/common/der/build.info | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/providers/common/der/build.info b/providers/common/der/build.info index b9fe4552d7..35c6787e98 100644 --- a/providers/common/der/build.info +++ b/providers/common/der/build.info @@ -13,8 +13,8 @@ DEPEND[$DER_DIGESTS_H]=oids_to_c.pm $DER_RSA_H=../include/prov/der_rsa.h $DER_RSA_GEN=der_rsa_gen.c $DER_RSA_AUX=der_rsa_key.c der_rsa_sig.c -$DER_RSA_COMMON=$DER_RSA_GEN der_rsa_sig.c -$DER_RSA_FIPSABLE=der_rsa_key.c +$DER_RSA_COMMON=$DER_RSA_GEN der_rsa_key.c +$DER_RSA_FIPSABLE=der_rsa_sig.c GENERATE[$DER_RSA_GEN]=der_rsa_gen.c.in DEPEND[$DER_RSA_GEN]=oids_to_c.pm @@ -97,9 +97,6 @@ ENDIF #----- Conclusion -# TODO(3.0) $COMMON should go to libcommon.a, but this currently leads -# to linking conflicts, so we add it to libfips.a and libdefault.a for -# the moment being $COMMON= $DER_RSA_COMMON $DER_DIGESTS_GEN $DER_WRAP_GEN IF[{- !$disabled{dsa} -}] @@ -112,8 +109,9 @@ IF[{- !$disabled{ec} -}] ENDIF IF[{- !$disabled{sm2} -}] - $COMMON = $COMMON $DER_SM2_GEN $DER_SM2_AUX + $NONFIPS = $NONFIPS $DER_SM2_GEN $DER_SM2_AUX ENDIF -SOURCE[../../libfips.a]=$COMMON $DER_RSA_FIPSABLE -SOURCE[../../libdefault.a]=$COMMON $DER_RSA_FIPSABLE +SOURCE[../../libcommon.a]= $COMMON +SOURCE[../../libfips.a]= $DER_RSA_FIPSABLE +SOURCE[../../libdefault.a]= $DER_RSA_FIPSABLE $NONFIPS |