From: Juergen Christ Date: Thu, 7 Jul 2022 16:57:55 +0000 (+0200) Subject: Fix SHA, SHAKE, and KECCAK ASM flag passing X-Git-Tag: openssl-3.2.0-alpha1~2416 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8b238f0e4c1198935e066ef19579ca694253286;p=thirdparty%2Fopenssl.git Fix SHA, SHAKE, and KECCAK ASM flag passing Flags for ASM implementations of SHA, SHAKE, and KECCAK were only passed to the FIPS provider and not to the default or legacy provider. This left some potential for optimization. Pass the correct flags also to these providers. Signed-off-by: Juergen Christ Reviewed-by: Tomas Mraz Reviewed-by: Patrick Steuer Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/18747) --- diff --git a/crypto/sha/build.info b/crypto/sha/build.info index b934843287e..556a658d8b5 100644 --- a/crypto/sha/build.info +++ b/crypto/sha/build.info @@ -82,6 +82,14 @@ SOURCE[../../providers/libfips.a]= $COMMON # need to be applied to all affected libraries and modules. DEFINE[../../libcrypto]=$SHA1DEF $KECCAK1600DEF DEFINE[../../providers/libfips.a]=$SHA1DEF $KECCAK1600DEF +DEFINE[../../providers/libdefault.a]=$SHA1DEF $KECCAK1600DEF +# We only need to include the SHA1DEF and KECCAK1600DEF stuff in the +# legacy provider when it's a separate module and it's dynamically +# linked with libcrypto. Otherwise, it already gets everything that +# the static libcrypto.a has, and doesn't need it added again. +IF[{- !$disabled{module} && !$disabled{shared} -}] + DEFINE[../providers/liblegacy.a]=$SHA1DEF $KECCAK1600DEF +ENDIF GENERATE[sha1-586.S]=asm/sha1-586.pl DEPEND[sha1-586.S]=../perlasm/x86asm.pl