From: James Muir Date: Sun, 29 Oct 2023 19:24:08 +0000 (-0400) Subject: quic http3 demo: minor updates X-Git-Tag: openssl-3.3.0-alpha1~660 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22fa1602da91af2194997e0576582bb4f0cdd7e0;p=thirdparty%2Fopenssl.git quic http3 demo: minor updates -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 Reviewed-by: Matt Caswell Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/22623) --- diff --git a/demos/http3/Makefile b/demos/http3/Makefile index 89bac3743e1..9d8212ff0a8 100644 --- a/demos/http3/Makefile +++ b/demos/http3/Makefile @@ -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) diff --git a/demos/http3/README.md b/demos/http3/README.md index e087aba1e18..e193aa13c1e 100644 --- a/demos/http3/README.md +++ b/demos/http3/README.md @@ -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