1berry/openssl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a few incorrect paths in some build.info files

Browse Source 
The following files referred to ../liblegacy.a when they should have
referred to ../../liblegacy.a.  This cause the creation of a mysterious
directory 'crypto/providers', and because of an increased strictness
with regards to where directories are created, configuration failure
on some platforms.

Fixes #23436

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
(Merged from https://github.com/openssl/openssl/pull/23452)

(cherry picked from commit 667b45454a47959ce2934b74c899662e686993de)
This commit is contained in:
Richard Levitte 2024-02-01 10:57:51 +01:00
parent f26feac760
commit ed0f79c7ae
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/aes/build.info
View File

@ -87,7 +87,7 @@ DEFINE[../../providers/libdefault.a]=$AESDEF
# already gets everything that the static libcrypto.a has, and doesn't need it # already gets everything that the static libcrypto.a has, and doesn't need it
# added again. # added again.
IF[{- !$disabled{module} && !$disabled{shared} -}] IF[{- !$disabled{module} && !$disabled{shared} -}]
DEFINE[../providers/liblegacy.a]=$AESDEF DEFINE[../../providers/liblegacy.a]=$AESDEF
ENDIF ENDIF
GENERATE[aes-ia64.s]=asm/aes-ia64.S GENERATE[aes-ia64.s]=asm/aes-ia64.S

2
crypto/ec/build.info
View File

@ -103,7 +103,7 @@ DEFINE[../../providers/libdefault.a]=$ECDEF
# Otherwise, it already gets everything that the static libcrypto.a # Otherwise, it already gets everything that the static libcrypto.a
# has, and doesn't need it added again. # has, and doesn't need it added again.
IF[{- !$disabled{module} && !$disabled{shared} -}] IF[{- !$disabled{module} && !$disabled{shared} -}]
DEFINE[../providers/liblegacy.a]=$ECDEF DEFINE[../../providers/liblegacy.a]=$ECDEF
ENDIF ENDIF
GENERATE[ecp_nistz256-x86.S]=asm/ecp_nistz256-x86.pl GENERATE[ecp_nistz256-x86.S]=asm/ecp_nistz256-x86.pl

2
crypto/sha/build.info
View File

@ -91,7 +91,7 @@ DEFINE[../../providers/libdefault.a]=$SHA1DEF $KECCAK1600DEF
# linked with libcrypto. Otherwise, it already gets everything that # linked with libcrypto. Otherwise, it already gets everything that
# the static libcrypto.a has, and doesn't need it added again. # the static libcrypto.a has, and doesn't need it added again.
IF[{- !$disabled{module} && !$disabled{shared} -}] IF[{- !$disabled{module} && !$disabled{shared} -}]
DEFINE[../providers/liblegacy.a]=$SHA1DEF $KECCAK1600DEF DEFINE[../../providers/liblegacy.a]=$SHA1DEF $KECCAK1600DEF
ENDIF ENDIF
GENERATE[sha1-586.S]=asm/sha1-586.pl GENERATE[sha1-586.S]=asm/sha1-586.pl

2
crypto/sm4/build.info
View File

@ -28,7 +28,7 @@ DEFINE[../../providers/libdefault.a]=$SM4DEF
# already gets everything that the static libcrypto.a has, and doesn't need it # already gets everything that the static libcrypto.a has, and doesn't need it
# added again. # added again.
IF[{- !$disabled{module} && !$disabled{shared} -}] IF[{- !$disabled{module} && !$disabled{shared} -}]
DEFINE[../providers/liblegacy.a]=$SM4DEF DEFINE[../../providers/liblegacy.a]=$SM4DEF
ENDIF ENDIF
GENERATE[sm4-armv8.S]=asm/sm4-armv8.pl GENERATE[sm4-armv8.S]=asm/sm4-armv8.pl