Add hq-interop configure option

Allow the building of the hq-interop client and server when we are
building our interop container

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26546)

diff --git a/Configure b/Configure
index 68961673d0d1b3622f791a8b873dc92bb86fe39a..f70c14134a48381559526fcfcf4d0083a7fae0f9 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -81,6 +81,11 @@ EOF
 # enable-demos  Enable the building of the example code in the demos directory
 # enable-h3demo Enable the http3 demo, which currently only links to the
 #               external nghttp3 library on unix platforms
+#
+# enable-hqinterop
+#               Enable the building of the hq-interop code for construction
+#               of the interop container
+#
 # no-hw         do not compile support for any crypto hardware.
 # [no-]threads  [don't] try to create a library that is suitable for
 #               multithreaded applications (default is "threads" if we
@@ -448,6 +453,7 @@ my @disablables = (
     "default-thread-pool",
     "demos",
     "h3demo",
+    "hqinterop",
     "deprecated",
     "des",
     "devcryptoeng",
@@ -586,6 +592,7 @@ our %disabled = ( # "what"         => "comment"
                   "crypto-mdebug-backtrace" => "default",
                   "demos"               => "default",
                   "h3demo"              => "default",
+                  "hqinterop"           => "default",
                   "devcryptoeng"        => "default",
                   "ec_nistp_64_gcc_128" => "default",
                   "egd"                 => "default",

diff --git a/test/build.info b/test/build.info
index 95415dca5800c8f89457b4b880d6b42a4dc4b14c..e1fa8e928c4eb484f1f07c36c6ffc3336c1ee8d8 100644 (file)
--- a/test/build.info
+++ b/test/build.info
@@ -4,6 +4,11 @@
 # Most of all, ../apps/lib/apps.c needs to be divided in smaller pieces to
 # be useful here.
 #
+
+IF[{- !$disabled{hqinterop} -}]
+  SUBDIRS=quic-openssl-docker
+ENDIF
+
 # Auxiliary program source (copied from ../apps/build.info)
 IF[{- $config{target} =~ /^(?:VC-|mingw|BC-)/ -}]
   # It's called 'init', but doesn't have much 'init' in it...

diff --git a/test/quic-openssl-docker/build.info b/test/quic-openssl-docker/build.info
new file mode 100644 (file)
index 0000000..6ef2970
--- /dev/null
+++ b/test/quic-openssl-docker/build.info
@@ -0,0 +1,6 @@
+
+IF[{- !$disabled{hqinterop} -}]
+  SUBDIRS=hq-interop
+ENDIF
+
+

diff --git a/test/quic-openssl-docker/hq-interop/build.info b/test/quic-openssl-docker/hq-interop/build.info
new file mode 100644 (file)
index 0000000..9c9a0e6
--- /dev/null
+++ b/test/quic-openssl-docker/hq-interop/build.info
@@ -0,0 +1,10 @@
+PROGRAMS{noinst} = quic-hq-interop \
+                   quic-hq-interop-server
+
+INCLUDE[quic-hq-interop]=../../../include
+SOURCE[quic-hq-interop]=quic-hq-interop.c
+DEPEND[quic-hq-interop]=../../../libcrypto ../../../libssl
+
+INCLUDE[quic-hq-interop-server]=../../../include
+SOURCE[quic-hq-interop-server]=quic-hq-interop-server.c
+DEPEND[quic-hq-interop-server]=../../../libcrypto ../../../libssl