Fixup conflict between 3rd party quic-tls api and quic-server

Build.info changes between quic-server and master occured here, resolve
them.  Can't do it as a fixup as the conficting changes have already
been merged to master

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26762)

diff --git a/ssl/quic/build.info b/ssl/quic/build.info
index 43a2c9479a91a9b2f44e77901bc7080ccf35f75c..230341db762548dcc832e02e1ac70ed709e9f54a 100644 (file)
--- a/ssl/quic/build.info
+++ b/ssl/quic/build.info
@@ -1,26 +1,29 @@
 $LIBSSL=../../libssl
 
-SOURCE[$LIBSSL]=quic_method.c quic_impl.c quic_wire.c quic_ackm.c quic_statm.c
-SOURCE[$LIBSSL]=cc_newreno.c quic_demux.c quic_record_rx.c
-SOURCE[$LIBSSL]=quic_record_tx.c quic_record_util.c quic_record_shared.c quic_wire_pkt.c
-SOURCE[$LIBSSL]=quic_rx_depack.c
-SOURCE[$LIBSSL]=quic_fc.c uint_set.c
-SOURCE[$LIBSSL]=quic_cfq.c quic_txpim.c quic_fifd.c quic_txp.c
-SOURCE[$LIBSSL]=quic_stream_map.c
-SOURCE[$LIBSSL]=quic_sf_list.c quic_rstream.c quic_sstream.c
-SOURCE[$LIBSSL]=quic_reactor.c
-SOURCE[$LIBSSL]=quic_reactor_wait_ctx.c
-SOURCE[$LIBSSL]=quic_channel.c quic_port.c quic_engine.c
-SOURCE[$LIBSSL]=quic_tserver.c
-SOURCE[$LIBSSL]=quic_tls.c
-SOURCE[$LIBSSL]=quic_thread_assist.c
-SOURCE[$LIBSSL]=quic_trace.c
-SOURCE[$LIBSSL]=quic_srtm.c quic_srt_gen.c
-SOURCE[$LIBSSL]=quic_lcidm.c quic_rcidm.c
-SOURCE[$LIBSSL]=quic_types.c
-SOURCE[$LIBSSL]=qlog_event_helpers.c
-IF[{- !$disabled{qlog} -}]
-  SOURCE[$LIBSSL]=json_enc.c qlog.c
-  SHARED_SOURCE[$LIBSSL]=../../crypto/getenv.c ../../crypto/ctype.c
+#QUIC TLS API is available even in the event of no-quic
+SOURCE[$LIBSSL]=quic_tls.c quic_tls_api.c
+IF[{- !$disabled{quic} -}]
+    SOURCE[$LIBSSL]=quic_method.c quic_impl.c quic_wire.c quic_ackm.c quic_statm.c
+    SOURCE[$LIBSSL]=cc_newreno.c quic_demux.c quic_record_rx.c
+    SOURCE[$LIBSSL]=quic_record_tx.c quic_record_util.c quic_record_shared.c quic_wire_pkt.c
+    SOURCE[$LIBSSL]=quic_rx_depack.c
+    SOURCE[$LIBSSL]=quic_fc.c uint_set.c
+    SOURCE[$LIBSSL]=quic_cfq.c quic_txpim.c quic_fifd.c quic_txp.c
+    SOURCE[$LIBSSL]=quic_stream_map.c
+    SOURCE[$LIBSSL]=quic_sf_list.c quic_rstream.c quic_sstream.c
+    SOURCE[$LIBSSL]=quic_reactor.c
+    SOURCE[$LIBSSL]=quic_reactor_wait_ctx.c
+    SOURCE[$LIBSSL]=quic_channel.c quic_port.c quic_engine.c
+    SOURCE[$LIBSSL]=quic_tserver.c
+    SOURCE[$LIBSSL]=quic_thread_assist.c
+    SOURCE[$LIBSSL]=quic_trace.c
+    SOURCE[$LIBSSL]=quic_srtm.c quic_srt_gen.c
+    SOURCE[$LIBSSL]=quic_lcidm.c quic_rcidm.c
+    SOURCE[$LIBSSL]=quic_types.c
+    SOURCE[$LIBSSL]=qlog_event_helpers.c
+    IF[{- !$disabled{qlog} -}]
+      SOURCE[$LIBSSL]=json_enc.c qlog.c
+      SHARED_SOURCE[$LIBSSL]=../../crypto/getenv.c ../../crypto/ctype.c
+    ENDIF
+    SOURCE[$LIBSSL]=quic_obj.c
 ENDIF
-SOURCE[$LIBSSL]=quic_obj.c