]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Fix ci break on building quic with no-siphash
authorNeil Horman <nhorman@openssl.org>
Sun, 23 Feb 2025 21:03:28 +0000 (16:03 -0500)
committerNeil Horman <nhorman@openssl.org>
Sun, 23 Feb 2025 22:16:03 +0000 (17:16 -0500)
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)

ssl/build.info

index 56657171d9ff76ad52f4ec2aa3b19438203d56c6..ab458c736cc6e298482c28094805984ea1de23b7 100644 (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