diff options
| -rw-r--r-- | crypto/whrlpool/build.info | 2 | ||||
| -rw-r--r-- | providers/common/der/build.info | 14 | ||||
| -rw-r--r-- | providers/fips-sources.checksums | 2 | ||||
| -rw-r--r-- | providers/fips.checksum | 2 | ||||
| -rw-r--r-- | providers/fips.module.sources | 3 | ||||
| -rw-r--r-- | providers/implementations/encode_decode/build.info | 6 | ||||
| -rw-r--r-- | providers/implementations/signature/build.info | 10 |
7 files changed, 13 insertions, 26 deletions
diff --git a/crypto/whrlpool/build.info b/crypto/whrlpool/build.info index 88f0c7bd3a..ab6cef2945 100644 --- 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 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 diff --git a/providers/fips-sources.checksums b/providers/fips-sources.checksums index dd8ae28a44..a127b70ef4 100644 --- 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 642611c889..65860fc8fc 100644 --- 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 7be12dc42e..8ea9df0973 100644 --- 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 06fe6aa462..537d393261 100644 --- 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 539a57e24b..fd3be7f3b9 100644 --- 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 |