From 1eb5ffcdc8a270b6d49b6b6f5097ebe61f66f648 Mon Sep 17 00:00:00 2001 From: Neil Horman Date: Sun, 23 Feb 2025 16:03:28 -0500 Subject: [PATCH] Fix ci break on building quic with no-siphash 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 Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/26874) --- ssl/build.info | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ssl/build.info b/ssl/build.info index 56657171d9f..ab458c736cc 100644 --- a/ssl/build.info +++ b/ssl/build.info @@ -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 -- 2.47.2