From f60559eb957b53d7fd5c8c9ab566fe353ea2d9f8 Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Mon, 25 Dec 2023 12:38:24 +0100 Subject: [PATCH] Disable building quicserver utility when configured with `no-apps` option Signed-off-by: Vitalii Koshura Reviewed-by: Paul Yang Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/23149) --- CHANGES.md | 5 +++++ util/build.info | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 6f7c66dbce..43f874ff9c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -28,6 +28,11 @@ OpenSSL 3.3 ### Changes between 3.2 and 3.3 [xx XXX xxxx] + * Disable building QUIC server utility when OpenSSL is configured with + `no-apps` + + *Vitalii Koshura* + * The activate and soft_load configuration settings for providers in openssl.cnf have been updated to require a value of [1|yes|true|on] (in lower or UPPER case) to enable the setting. Conversely a value diff --git a/util/build.info b/util/build.info index cf06f15ae4..e4aab44b38 100644 --- a/util/build.info +++ b/util/build.info @@ -6,9 +6,9 @@ SCRIPTS{noinst}=wrap.pl SOURCE[wrap.pl]=wrap.pl.in DEPEND[wrap.pl]=../configdata.pm -IF[{- !$disabled{quic} && !$disabled{stdio} -}] +IF[{- !$disabled{quic} && !$disabled{stdio} && !$disabled{apps} -}] PROGRAMS{noinst}=quicserver SOURCE[quicserver]=quicserver.c -INCLUDE[quicserver]=../include ../apps/include -DEPEND[quicserver]=../libcrypto.a ../libssl.a + INCLUDE[quicserver]=../include ../apps/include + DEPEND[quicserver]=../libcrypto.a ../libssl.a ENDIF