public/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix ci break on building quic with no-siphash

Browse source 
SHARED_SOURCE doesn't pull in siphash if its disabled in the
configuration leading to undefined symbols, which we need for quic.

If siphash is disabled in the build, then pull it in via a SOURCE
addition, otherwise pull it in via SHARED_SOURCE

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26874)
This commit is contained in:
Neil Horman 2025-02-23 16:03:28 -05:00
parent ba90c49125
commit 1eb5ffcdc8
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ssl/build.info
View file

@ -22,7 +22,7 @@ SOURCE[../libssl]=\
# in libssl as well.
SHARED_SOURCE[../libssl]=\
../crypto/packet.c ../crypto/quic_vlint.c ../crypto/time.c \
../crypto/hashtable/hashfunc.c ../crypto/siphash/siphash.c
../crypto/hashtable/hashfunc.c
IF[{- !$disabled{'deprecated-3.0'} -}]
SOURCE[../libssl]=ssl_rsa_legacy.c
@ -30,4 +30,9 @@ ENDIF
IF[{- !$disabled{quic} -}]
SOURCE[../libssl]=priority_queue.c
IF[{- $disabled{siphash} -}]
SOURCE[../libssl]=../crypto/siphash/siphash.c
ELSE
SHARED_SOURCE[../libssl]=../crypto/siphash/siphash.c
ENDIF
ENDIF