]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
demos: wire up tls-server-block
authorEugene Syromiatnikov <esyr@openssl.org>
Fri, 26 Jun 2026 12:56:11 +0000 (14:56 +0200)
committerNorbert Pocs <norbertp@openssl.org>
Mon, 20 Jul 2026 11:18:33 +0000 (13:18 +0200)
The blocking TLS server demo code was added f4b4a185b546 "MVP demo TLS
server", which, while was applied after 2000281dad31 "Convert demos
to primary build system", was authored before, and hasn't been updated
accordingly.  Rescind that omission by add the relevant introes
to build.info.

Also, while at it, mention tls-server-block in demos/README.txt.

Complements: f4b4a185b546 "MVP demo TLS server"
Reported-by: Frederik Wedel-Heinen <frederik.wedel-heinen@dencrypt.dk>
Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Bob Beck <beck@openssl.org>
MergeDate: Mon Jul 20 11:18:52 2026
(Merged from https://github.com/openssl/openssl/pull/31751)

demos/README.txt
demos/guide/build.info

index 9ccb5f1c2fb430673979717e45bd190967ff1c20..9b9d90aba20fceed8119b31d7f848e720280ad82 100644 (file)
@@ -38,6 +38,7 @@ quic-client-non-block.c: A simple non-blocking QUIC client
 quic-multi-stream.c:     A simple QUIC client using multiple streams
 tls-client-block.c:      A simple blocking SSL/TLS client
 tls-client-non-block.c:  A simple non-blocking SSL/TLS client
+tls-server-block.c:      A simple blocking SSL/TLS server
 
 http3:                 Demonstration of how to use OpenSSL's QUIC capabilities
                        for HTTP/3.
index de184ff0d1aa13192d21c0e559401052916bc638..7b5b54f07311784528aa09d243307018ffd90c6a 100644 (file)
@@ -5,6 +5,7 @@
 #    LD_LIBRARY_PATH=../.. ./tls-client-block www.example.com 443
 
 PROGRAMS{noinst} = tls-client-block \
+                   tls-server-block \
                    quic-client-block \
                    quic-multi-stream \
                    tls-client-non-block \
@@ -17,6 +18,10 @@ INCLUDE[tls-client-block]=../../include
 SOURCE[tls-client-block]=tls-client-block.c
 DEPEND[tls-client-block]=../../libcrypto ../../libssl
 
+INCLUDE[tls-server-block]=../../include
+SOURCE[tls-server-block]=tls-server-block.c
+DEPEND[tls-server-block]=../../libcrypto ../../libssl
+
 INCLUDE[quic-client-block]=../../include
 SOURCE[quic-client-block]=quic-client-block.c
 DEPEND[quic-client-block]=../../libcrypto ../../libssl