Skip to content

Commit ed0f79c

Browse files
committed
Fix a few incorrect paths in some build.info files
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 openssl#23436 Reviewed-by: Matt Caswell <[email protected]> Reviewed-by: Tomas Mraz <[email protected]> Reviewed-by: Tom Cosgrove <[email protected]> (Merged from openssl#23452) (cherry picked from commit 667b454)
1 parent f26feac commit ed0f79c

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

crypto/aes/build.info

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ DEFINE[../../providers/libdefault.a]=$AESDEF
8787
# already gets everything that the static libcrypto.a has, and doesn't need it
8888
# added again.
8989
IF[{- !$disabled{module} && !$disabled{shared} -}]
90-
DEFINE[../providers/liblegacy.a]=$AESDEF
90+
DEFINE[../../providers/liblegacy.a]=$AESDEF
9191
ENDIF
9292

9393
GENERATE[aes-ia64.s]=asm/aes-ia64.S

crypto/ec/build.info

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ DEFINE[../../providers/libdefault.a]=$ECDEF
103103
# Otherwise, it already gets everything that the static libcrypto.a
104104
# has, and doesn't need it added again.
105105
IF[{- !$disabled{module} && !$disabled{shared} -}]
106-
DEFINE[../providers/liblegacy.a]=$ECDEF
106+
DEFINE[../../providers/liblegacy.a]=$ECDEF
107107
ENDIF
108108

109109
GENERATE[ecp_nistz256-x86.S]=asm/ecp_nistz256-x86.pl

crypto/sha/build.info

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ DEFINE[../../providers/libdefault.a]=$SHA1DEF $KECCAK1600DEF
9191
# linked with libcrypto. Otherwise, it already gets everything that
9292
# the static libcrypto.a has, and doesn't need it added again.
9393
IF[{- !$disabled{module} && !$disabled{shared} -}]
94-
DEFINE[../providers/liblegacy.a]=$SHA1DEF $KECCAK1600DEF
94+
DEFINE[../../providers/liblegacy.a]=$SHA1DEF $KECCAK1600DEF
9595
ENDIF
9696

9797
GENERATE[sha1-586.S]=asm/sha1-586.pl

crypto/sm4/build.info

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ DEFINE[../../providers/libdefault.a]=$SM4DEF
2828
# already gets everything that the static libcrypto.a has, and doesn't need it
2929
# added again.
3030
IF[{- !$disabled{module} && !$disabled{shared} -}]
31-
DEFINE[../providers/liblegacy.a]=$SM4DEF
31+
DEFINE[../../providers/liblegacy.a]=$SM4DEF
3232
ENDIF
3333

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

0 commit comments

Comments
 (0)