From: Neil Horman <nhorman@openssl.org>
Date: Sun, 23 Feb 2025 21:03:28 +0000 (-0500)
Subject: Fix ci break on building quic with no-siphash
X-Git-Tag: openssl-3.5.0-alpha1~94
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1eb5ffcdc8a270b6d49b6b6f5097ebe61f66f648;p=thirdparty%2Fopenssl.git

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 <tjh@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26874)
---

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