]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
quic http3 demo: minor updates
authorJames Muir <james@openssl.org>
Sun, 29 Oct 2023 19:24:08 +0000 (15:24 -0400)
committerPauli <pauli@openssl.org>
Wed, 8 Nov 2023 00:12:55 +0000 (11:12 +1100)
-update run command to include LD_LIBRARY_PATH
-suggest installing libnghttp3-dev on Ubuntu
-drop "-f" from clean recipe (it is already included in $(RM))

Part of https://github.com/openssl/project/issues/253

Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22623)

demos/http3/Makefile
demos/http3/README.md

index 89bac3743e1ef0ffaf693989d41acf6fbe6ac819..9d8212ff0a87b6470df73eede14aa3a65184de26 100644 (file)
@@ -1,11 +1,17 @@
-CFLAGS = -I../../include -g -Wall
+#
+# To run the demo when linked with a shared library (default) ensure that
+# libcrypto and libssl are on the library path. For example:
+#
+#    LD_LIBRARY_PATH=../.. ./ossl-nghttp3-demo www.example.com:443
+
+CFLAGS  = -I../../include -g -Wall -Wsign-compare
 LDFLAGS = -L../..
-LDLIBS = -lcrypto -lssl -lnghttp3
+LDLIBS  = -lcrypto -lssl -lnghttp3
 
 all: ossl-nghttp3-demo
 
 clean:
-       $(RM) -f ossl-nghttp3-demo *.o
+       $(RM) ossl-nghttp3-demo *.o
 
 ossl-nghttp3-demo: ossl-nghttp3-demo.o ossl-nghttp3.o
        $(CC) $(CFLAGS) -o "$@" $^ $(LDFLAGS) $(LDLIBS)
index e087aba1e182e534e886797f471928219d645293..e193aa13c1e6076cd1beadae58723e32715254d9 100644 (file)
@@ -12,7 +12,8 @@ The demo is structured into two parts:
   layer (`ossl-nghttp3-demo.c`).
 
 The Makefile in this directory can be used to build the demo on \*nix-style
-systems. You will need to have the `nghttp3` library available.
+systems.  You will need the `nghttp3` library and header file.  On
+Ubuntu, these can be obtained by installing the package `libnghttp3-dev`.
 
 Running the Demo
 ----------------
@@ -26,7 +27,7 @@ port as the sole argument:
 
 ```shell
 $ make
-$ ./ossl-nghttp3-demo www.google.com:443
+$ LD_LIBRARY_PATH=../.. ./ossl-nghttp3-demo www.google.com:443
 ```
 
 The demo produces the HTTP response headers in textual form as output followed