Skip to content

Commit

Permalink
Fix a few incorrect paths in some build.info files
Browse files Browse the repository at this point in the history
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 #23452)

(cherry picked from commit 667b454)
  • Loading branch information
levitte committed Feb 2, 2024
1 parent f26feac commit ed0f79c
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion crypto/aes/build.info
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ DEFINE[../../providers/libdefault.a]=$AESDEF
# 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]=$AESDEF
DEFINE[../../providers/liblegacy.a]=$AESDEF
ENDIF

GENERATE[aes-ia64.s]=asm/aes-ia64.S
Expand Down
2 changes: 1 addition & 1 deletion crypto/ec/build.info
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ DEFINE[../../providers/libdefault.a]=$ECDEF
# 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]=$ECDEF
DEFINE[../../providers/liblegacy.a]=$ECDEF
ENDIF

GENERATE[ecp_nistz256-x86.S]=asm/ecp_nistz256-x86.pl
Expand Down
2 changes: 1 addition & 1 deletion crypto/sha/build.info
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ DEFINE[../../providers/libdefault.a]=$SHA1DEF $KECCAK1600DEF
# 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
DEFINE[../../providers/liblegacy.a]=$SHA1DEF $KECCAK1600DEF
ENDIF

GENERATE[sha1-586.S]=asm/sha1-586.pl
Expand Down
2 changes: 1 addition & 1 deletion crypto/sm4/build.info
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ DEFINE[../../providers/libdefault.a]=$SM4DEF
# 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]=$SM4DEF
DEFINE[../../providers/liblegacy.a]=$SM4DEF
ENDIF

GENERATE[sm4-armv8.S]=asm/sm4-armv8.pl
Expand Down

0 comments on commit ed0f79c

Please sign in to comment.