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)

diff --git a/crypto/whrlpool/build.info b/crypto/whrlpool/build.info
index 88f0c7bd3a886206a7e1708f57747d94f527b998..ab6cef2945681a6cbd26e8d9c3d39b7c7dfa1dc2 100644 (file)
--- a/crypto/whrlpool/build.info
+++ b/crypto/whrlpool/build.info
@@ -30,4 +30,4 @@ ENDIF
 GENERATE[wp-mmx.s]=asm/wp-mmx.pl
 DEPEND[wp-mmx.s]=../perlasm/x86asm.pl
 
-GENERATE[wp-x86_64.s]=asm/wp-x86_64.pl
\ No newline at end of file
+GENERATE[wp-x86_64.s]=asm/wp-x86_64.pl

diff --git a/providers/common/der/build.info b/providers/common/der/build.info
index b9fe4552d71aee121edc940e9c377fda997bad9d..35c6787e98e844f4bf0bb6cdab313060850a053f 100644 (file)
--- 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

diff --git a/providers/fips-sources.checksums b/providers/fips-sources.checksums
index dd8ae28a4477e8763eb3cf3eda6e36885acb5934..a127b70ef42add49fb7ff03534920fd19755f056 100644 (file)
--- a/providers/fips-sources.checksums
+++ b/providers/fips-sources.checksums
@@ -316,8 +316,6 @@ b8f2f94daeaf20c636c90e386284c246cfded0c8275411fa02fe68b534520b95  providers/comm
 f3b089fd3dcccc8e3ebfbbdbf87c47d58330f82bd0e2a1223da74977930cccf1  providers/common/der/der_ecx_key.c
 3ba47f32b30f5540a34b3a8df7a4fd966aab9abcbb2b643af75a83a9ccda1df0  providers/common/der/der_rsa_key.c
 7e8d579986f53eaf1875d677e5cf4adfd4ccf79db0275368f6cac580ab6007ca  providers/common/der/der_rsa_sig.c
-9c9572d26ec41df0418547352dbdef353ecf9a2a633889dc494084ee9fe6b1d3  providers/common/der/der_sm2_key.c
-390b2b6ba321bddc416688d4a51d9e04db7d84d4f398947d496d043e8fb22a01  providers/common/der/der_sm2_sig.c
 d447cd774869da68a2cc0bbb19c547ee6ed4858c7aee1f3d5bba7796f97823a9  providers/common/digest_to_nid.c
 737cc1228106e555e9bab24e3c2438982e04e05b0d5b9ee6995d71df16c49143  providers/common/provider_ctx.c
 71c3fbb9bd80f5e7a217cf8005df61f96a645fbdd9daca9949ceef6d33a1feb0  providers/common/provider_err.c

diff --git a/providers/fips.checksum b/providers/fips.checksum
index 642611c889464e5cb0ae103eab12fa07dd2f5cd5..65860fc8fcf095880cbdb690a8d556d8b8550ac8 100644 (file)
--- a/providers/fips.checksum
+++ b/providers/fips.checksum
@@ -1 +1 @@
-90d4616e33b95990f96dd2cb1798cae41e6591d5cb55a4f589307908fa699587  providers/fips-sources.checksums
+685bc28466bcc7a645e423f4994d0f6d33d32368859ffdd9e42c2983934bffbb  providers/fips-sources.checksums

diff --git a/providers/fips.module.sources b/providers/fips.module.sources
index 7be12dc42e9269af01b5e5913f1b99d51494d578..8ea9df09736ac1c434aa0e719069e66672efa7e8 100644 (file)
--- a/providers/fips.module.sources
+++ b/providers/fips.module.sources
@@ -321,9 +321,6 @@ providers/common/der/der_ecx_key.c
 providers/common/der/der_rsa_gen.c.in
 providers/common/der/der_rsa_key.c
 providers/common/der/der_rsa_sig.c
-providers/common/der/der_sm2_gen.c.in
-providers/common/der/der_sm2_key.c
-providers/common/der/der_sm2_sig.c
 providers/common/der/der_wrap_gen.c.in
 providers/common/digest_to_nid.c
 providers/common/provider_ctx.c

diff --git a/providers/implementations/encode_decode/build.info b/providers/implementations/encode_decode/build.info
index 06fe6aa4622176c74ed186499c2da5f22cfde08b..537d39326157d2e7cd6d23439b2ed514c8ca46c1 100644 (file)
--- a/providers/implementations/encode_decode/build.info
+++ b/providers/implementations/encode_decode/build.info
@@ -3,12 +3,6 @@
 
 $ENCODER_GOAL=../../libdefault.a
 $DECODER_GOAL=../../libdefault.a
-$RSA_GOAL=../../libdefault.a
-$FFC_GOAL=../../libdefault.a
-$DH_GOAL=../../libdefault.a
-$DSA_GOAL=../../libdefault.a
-$ECX_GOAL=../../libdefault.a
-$EC_GOAL=../../libdefault.a
 
 SOURCE[$ENCODER_GOAL]=endecoder_common.c
 

diff --git a/providers/implementations/signature/build.info b/providers/implementations/signature/build.info
index 539a57e24b16153f051ebdb60793fe50289f1a99..fd3be7f3b9ddc2ccd7b0daf0b76da972bc234fcd 100644 (file)
--- a/providers/implementations/signature/build.info
+++ b/providers/implementations/signature/build.info
@@ -21,10 +21,10 @@ ENDIF
 
 SOURCE[$RSA_GOAL]=rsa_sig.c
 
-DEPEND[rsa.o]=../../common/include/prov/der_rsa.h
-DEPEND[dsa.o]=../../common/include/prov/der_dsa.h
-DEPEND[ecdsa.o]=../../common/include/prov/der_ec.h
-DEPEND[eddsa.o]=../../common/include/prov/der_ecx.h
-DEPEND[sm2sig.o]=../../common/include/prov/der_sm2.h
+DEPEND[rsa_sig.o]=../../common/include/prov/der_rsa.h
+DEPEND[dsa_sig.o]=../../common/include/prov/der_dsa.h
+DEPEND[ecdsa_sig.o]=../../common/include/prov/der_ec.h
+DEPEND[eddsa_sig.o]=../../common/include/prov/der_ecx.h
+DEPEND[sm2_sig.o]=../../common/include/prov/der_sm2.h
 
 SOURCE[$MAC_GOAL]=mac_legacy_sig.c