Skip to content

Commit a7b5f01

Browse files
committed
Explicitly add relevant defines to libdefault.a
Fixes openssl#33096
1 parent c69b5af commit a7b5f01

14 files changed

Lines changed: 13 additions & 3 deletions

File tree

‎crypto/camellia/build.info‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ ENDIF
1616

1717
SOURCE[../../libcrypto]=cmll_ecb.c cmll_ofb.c cmll_cfb.c cmll_ctr.c $CMLLASM
1818
DEFINE[../../libcrypto]=$CMLLDEF
19+
DEFINE[../../providers/libdefault.a]=$CMLLDEF
1920

2021
GENERATE[cmll-x86.S]=asm/cmll-x86.pl
2122
DEPEND[cmll-x86.S]=../perlasm/x86asm.pl

‎crypto/chacha/build.info‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ ENDIF
3939

4040
SOURCE[../../libcrypto]=$CHACHAASM
4141
DEFINE[../../libcrypto]=$CHACHADEF
42+
DEFINE[../../providers/libdefault.a]=$CHACHADEF
4243

4344
GENERATE[chacha-x86.S]=asm/chacha-x86.pl
4445
GENERATE[chacha-x86_64.s]=asm/chacha-x86_64.pl

‎crypto/des/build.info‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ IF[{- !$disabled{module} && !$disabled{shared} -}]
2828
ENDIF
2929

3030
DEFINE[../../libcrypto]=$DESDEF
31+
DEFINE[../../providers/libdefault.a]=$DESDEF
3132
DEFINE[../../providers/libfips.a]=$DESDEF
3233

3334
# When all deprecated symbols are removed, libcrypto doesn't export the

‎crypto/hmac/build.info‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ IF[{- !$disabled{asm} -}]
1717
ENDIF
1818

1919
DEFINE[../../libcrypto]=$HMACDEF
20+
DEFINE[../../providers/libdefault.a]=$HMACDEF
2021
DEFINE[../../providers/libfips.a]=$HMACDEF
2122

2223
SOURCE[../../libcrypto]=$COMMON $HMACASM

‎crypto/md5/build.info‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ ENDIF
3333
# Implementations are now spread across several libraries, so the defines
3434
# need to be applied to all affected libraries and modules.
3535
DEFINE[../../libcrypto]=$MD5DEF
36+
DEFINE[../../providers/libdefault.a]=$MD5DEF
3637
DEFINE[../../providers/liblegacy.a]=$MD5DEF
3738

3839
GENERATE[md5-586.S]=asm/md5-586.pl

‎crypto/ml_dsa/build.info‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,5 @@ ENDIF
4242
GENERATE[ml_dsa_ntt-x86_64.s]=asm/ml_dsa_ntt-x86_64.pl
4343

4444
DEFINE[../../libcrypto]=$ML_DSA_DEF
45+
DEFINE[../../providers/libdefault.a]=$ML_DSA_DEF
4546
DEFINE[../../providers/libfips.a]=$ML_DSA_DEF

‎crypto/ml_kem/build.info‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ ENDIF
3737
# Implementations are now spread across several libraries, so the defines
3838
# need to be applied to all affected libraries and modules.
3939
DEFINE[../../libcrypto]=$MLKEMDEF
40+
DEFINE[../../providers/libdefault.a]=$MLKEMDEF
4041
DEFINE[../../providers/libfips.a]=$MLKEMDEF
4142

4243
GENERATE[ml_kem_avx2.s]=asm/ml_kem_avx2.pl

‎crypto/modes/build.info‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ SOURCE[../../providers/libfips.a]=$COMMON
6868
# Implementations are now spread across several libraries, so the defines
6969
# need to be applied to all affected libraries and modules.
7070
DEFINE[../../libcrypto]=$MODESDEF
71+
DEFINE[../../providers/libdefault.a]=$MODESDEF
7172
DEFINE[../../providers/libfips.a]=$MODESDEF
7273

7374

‎crypto/poly1305/build.info‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ SOURCE[../../libcrypto]=poly1305.c $POLY1305ASM
3434
# Implementations are now spread across several libraries, so the defines
3535
# need to be applied to all affected libraries and modules.
3636
DEFINE[../../libcrypto]=$POLY1305DEF
37+
DEFINE[../../providers/libdefault.a]=$POLY1305DEF
3738

3839
GENERATE[poly1305-sparcv9.S]=asm/poly1305-sparcv9.pl
3940
INCLUDE[poly1305-sparcv9.o]=..

‎crypto/ripemd/build.info‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ ENDIF
1717

1818
SOURCE[../../libcrypto]=rmd_dgst.c rmd_one.c $RMD160ASM
1919
DEFINE[../../libcrypto]=$RMD160DEF
20+
DEFINE[../../providers/libdefault.a]=$RMD160DEF
2021

2122
# When all deprecated symbols are removed, libcrypto doesn't export the
2223
# RIPEMD160 functions, so we must include them directly in liblegacy.a

0 commit comments

Comments
 (0)