57 Commits

Author	SHA1	Message	Date
Michael Baentsch	51ce5499f9	Introduce SSL_OP_SERVER_PREFERENCE to replace SSL_OP_CIPHER_SERVER_PREFERENCE misnomer ... Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/27981)	2025-07-09 12:10:57 +02:00
Tomas Mraz	8067e713a1	demos: Silence warnings on Win64 builds ... Reviewed-by: Saša Nedvědický <sashan@openssl.org> Reviewed-by: Neil Horman <nhorman@openssl.org> (Merged from https://github.com/openssl/openssl/pull/27806)	2025-07-02 17:26:26 +02:00
Benson Muite	10bd6fa8ca	demos/guide/tls-client-block.c Spelling correction ... Fix spelling error in one word. CLA: trivial Reviewed-by: Paul Dale <ppzgs1@gmail.com> Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com> (Merged from https://github.com/openssl/openssl/pull/27611)	2025-05-16 12:17:00 +02:00
Jon Ericson	f014892d9f	Point to new docs location ... Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Paul Dale <ppzgs1@gmail.com> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/27331)	2025-04-15 15:56:16 +01:00
openssl-machine	0c679f5566	Copyright year updates ... Reviewed-by: Neil Horman <nhorman@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> Release: yes	2025-03-12 13:35:59 +00:00
Neil Horman	ec6200bf0f	Move hq-interop code to test/quic-openssl-docker ... Its the only place we use this code, so put the code in that directory Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/26546)	2025-02-17 11:27:33 -05:00
Neil Horman	17dc32c51b	quic-hq-interop: Allow for retries if we've reached our max stream limit ... Several servers defer the sending of max stream frames. For instance quic-go uses a go-routine to do the sending after sufficient existing streams have finished, while mvfst seems to wait for all outstanding streams to be closed before issuing a new batch. This result in the client, if all streams are in use, getting a transient NULL return from SSL_new_stream(). Check for the stream limit being reached and allow a number of retries before giving up to give the server a chance to issue us more streams. Also dead-reckon the batch count of streams we use in parallel to be 1/4 of our total number of available streams (generally hard coded to 100 for most servers) to avoid using all our streams at once. It would be really nice to have an api to expose our negotiated transport parameters so that the application can know what this limit is, but until then we have to just guess. Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/26527)	2025-02-17 11:27:33 -05:00
Andrew Dinh	e9aa0b6c0e	IPv6 support for quic interop ... Modify the QUIC HQ interop server/client to support both IPv4 and IPv6. Reviewed-by: Neil Horman <nhorman@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/26194)	2025-02-17 11:27:33 -05:00
Neil Horman	a99c76d94c	Do read retries in quic hq-interop server ... Normally the throughput test in the interop harness requests several hundred very small files, resulting in lots of small stream packets from the client, which are nominally read in a single read operation (as they typically fit into a single stream frame), and the server was written to expect that. However, its still possible, if a stream frame is packed to the end of a datagram, that only part of its content is carried, finished in a subsequent stream packet, which leads to a short read. Augment the server to properly handle SSL_read transient failures so that such an occurance is handled properly. Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/26198)	2025-02-17 11:27:33 -05:00
Neil Horman	d1c3bb2f74	Add tracking of receive credit for unvalidated connections ... Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Saša Nedvědický <sashan@openssl.org> (Merged from https://github.com/openssl/openssl/pull/26178)	2025-02-17 11:27:33 -05:00
Neil Horman	78f7141c12	Disable server address validation on interop handshake test ... The handshake test in the interop suite requires that no server address validation be preformed, so disable it for this test Reviewed-by: Saša Nedvědický <sashan@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/26114)	2025-02-17 11:27:33 -05:00
Neil Horman	fd50924d01	Augment quic interop harness to support server side interop tests ... the quic-interop-runner that we use for interop testing currently only supports openssl client testing, as we had previously not had a server to test with. This PR rectifies that by doing the following: 1) Adding a quic-hq-interop-server.c file in demos/guide 2) Augmenting our interop Dockerfile and entrypoint to support our interop containter running in a server role With these changes we are able to do server side interop testing Reviewed-by: Saša Nedvědický <sashan@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/26000)	2025-02-17 11:27:33 -05:00
Andrew Dinh	417a8e8812	Remove extra FD_SET ... Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/25532)	2025-02-17 11:27:33 -05:00
Andrew Dinh	d9d4d84ceb	Add demo QUIC non-blocking server ... Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Saša Nedvědický <sashan@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/25431)	2025-02-17 11:27:33 -05:00
Andrew Dinh	9dfacaa82a	Add a guide for demo QUIC blocking server ... Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Neil Horman <nhorman@openssl.org> (Merged from https://github.com/openssl/openssl/pull/25361)	2025-02-17 11:27:33 -05:00
Andrew Dinh	dad45ea769	Adds a new demo blocking QUIC server for use with the existing demo QUIC clients ... Remove util/quicserver.c Reviewed-by: Saša Nedvědický <sashan@openssl.org> Reviewed-by: Neil Horman <nhorman@openssl.org> (Merged from https://github.com/openssl/openssl/pull/25465)	2025-02-17 11:27:33 -05:00
Frederik Wedel-Heinen	65db21935a	Avoid leaking memory when realloc fails ... In ossl_property_merge() we can drop the realloc because it just makes the allocation smaller. In quic-hq-interop.c we check the realloc result. Reviewed-by: Kurt Roeckx <kurt@roeckx.be> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/26244)	2025-01-03 15:58:26 +01:00
Neil Horman	43ba601723	Remove sslkeylog file setup from quic-hq-interop ... Now that libcrypto supports the user of SSLKEYLOGFILE, the interop demo attempts to open the same file based on the same env variable. The hq-interop-demo code can just be removed, and it fixes the open failure when both libcrypto and hq-interop attempt to open and write the same file, which is causing the nightly failure Reviewed-by: Paul Dale <ppzgs1@gmail.com> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/25819)	2024-10-30 11:49:11 +00:00
Neil Horman	5f43a3376b	Add SSL_CIPHER_SUITES env variable to quic-hq-interop ... To run the chacha20 test in interop we need to: 1) negotiate an hq-interop alpn 2) only use chacha 20 Item 1 requires the use of quic-hq-interop, the latter requires this change Reviewed-by: Viktor Dukhovni <viktor@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/25528)	2024-10-04 17:42:49 +02:00
Neil Horman	0fdf965bf0	review fixups for quic-hq-interop ... Reviewed-by: Sasa Nedvedicky <sashan@openssl.org> Reviewed-by: Viktor Dukhovni <viktor@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/25426)	2024-09-13 15:37:08 -04:00
Neil Horman	a62fb94609	Clean up style issues ... Reviewed-by: Sasa Nedvedicky <sashan@openssl.org> Reviewed-by: Viktor Dukhovni <viktor@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/25426)	2024-09-13 15:37:08 -04:00
Neil Horman	e4bfcee240	Adding more documentation ... Reviewed-by: Sasa Nedvedicky <sashan@openssl.org> Reviewed-by: Viktor Dukhovni <viktor@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/25426)	2024-09-13 15:37:08 -04:00
Neil Horman	1b6638b1d8	Do batching of stream requests ... We have a limited number of streams to use send requests in accordance with the number of streams we have and batch requests according to that limit Reviewed-by: Sasa Nedvedicky <sashan@openssl.org> Reviewed-by: Viktor Dukhovni <viktor@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/25426)	2024-09-13 15:37:08 -04:00
Neil Horman	34d6ec804b	support polling of multiple streams ... Reviewed-by: Sasa Nedvedicky <sashan@openssl.org> Reviewed-by: Viktor Dukhovni <viktor@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/25426)	2024-09-13 15:37:08 -04:00
Neil Horman	1b114e39ae	Add lots of docs ... Reviewed-by: Sasa Nedvedicky <sashan@openssl.org> Reviewed-by: Viktor Dukhovni <viktor@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/25426)	2024-09-13 15:37:08 -04:00
Neil Horman	d978e5fb06	Adding session resume support to hq-interop ... Reviewed-by: Sasa Nedvedicky <sashan@openssl.org> Reviewed-by: Viktor Dukhovni <viktor@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/25426)	2024-09-13 15:37:08 -04:00
Neil Horman	2858149e44	Adding an hq-interop alpn client ... Reviewed-by: Sasa Nedvedicky <sashan@openssl.org> Reviewed-by: Viktor Dukhovni <viktor@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/25426)	2024-09-13 15:35:11 -04:00
Tomas Mraz	7ed6de997f	Copyright year updates ... Reviewed-by: Neil Horman <nhorman@openssl.org> Release: yes	2024-09-05 09:35:49 +02:00
Viktor Dukhovni	f4b4a185b5	MVP demo TLS server ... - No concurrency, one client-at-a-time - Blocking - No client certs - Fixed chain and key file names - Minimal support for session resumption Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Todd Short <todd.short@me.com> (Merged from https://github.com/openssl/openssl/pull/24505)	2024-06-18 13:49:11 -04:00
Neil Horman	f2f13cff21	Fix warnings found by clang in CI ... Reviewed-by: Nicola Tuveri <nic.tuv@gmail.com> Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Paul Dale <ppzgs1@gmail.com> Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com> (Merged from https://github.com/openssl/openssl/pull/24047)	2024-04-12 08:02:19 -04:00
Neil Horman	7a7fbeb924	fix all the warnings in our demos and make them enableable ... Fix up the warnings in the demos and make them configurable with enable-demos Reviewed-by: Nicola Tuveri <nic.tuv@gmail.com> Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Paul Dale <ppzgs1@gmail.com> Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com> (Merged from https://github.com/openssl/openssl/pull/24047)	2024-04-12 08:02:19 -04:00
Neil Horman	2000281dad	Convert demos to primary build system ... Reviewed-by: Nicola Tuveri <nic.tuv@gmail.com> Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Paul Dale <ppzgs1@gmail.com> Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com> (Merged from https://github.com/openssl/openssl/pull/24047)	2024-04-12 08:02:19 -04:00
Neil Horman	5091aadc22	augment quic demos to support ipv4/6 connections ... Because the quicserver utility supports expressly listening in ipv4/6 mode, its possible/likely that the server will listen on an ipv4 address, while the clients will connect via ipv6, leading to connection failures. Augment quic demo clients to afford them the same -6 option that the server has so that connection family can be co-ordinated Reviewed-by: Nicola Tuveri <nic.tuv@gmail.com> Reviewed-by: Hugo Landau <hlandau@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/22577)	2023-11-21 13:01:54 +01:00
James Muir	86db958835	demos: tidy up makefiles, fix warnings ... Update makefiles so that consistent patterns are used. Object files are compiled from source using an implicit rule (but using our CFLAGS); for linking, we give an explicit rule. Ensure that "make test" works in each subdirectory (even if it does not actually run any applications). The top-level demo makefile now works. The makefiles are not make-agnostic. e.g. they use the variable $(RM) in "clean" recipes, which is defined in gnu-make but may not be defined in others. Part of #17806 Testing: $ cd demo $ make test Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/22698)	2023-11-15 08:43:23 +01:00
Matt Caswell	cb8107b632	Update the README with information about how to run the QUIC demos ... Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Hugo Landau <hlandau@openssl.org> (Merged from https://github.com/openssl/openssl/pull/22552)	2023-11-02 08:14:46 +00:00
Matt Caswell	420037c82c	Update the QUIC demos to accept hostname/port on the command line ... Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Hugo Landau <hlandau@openssl.org> (Merged from https://github.com/openssl/openssl/pull/22552)	2023-11-02 08:14:46 +00:00
Matt Caswell	a2b824730e	Extend the README to describe how to run the TLS demos ... We also supply some test certificates for use with the demos. Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Hugo Landau <hlandau@openssl.org> (Merged from https://github.com/openssl/openssl/pull/22552)	2023-11-02 08:14:46 +00:00
Matt Caswell	2ec4e73c01	Amend the TLS demos to accept hostname/port as an argument ... Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Hugo Landau <hlandau@openssl.org> (Merged from https://github.com/openssl/openssl/pull/22552)	2023-11-02 08:14:38 +00:00
Matt Caswell	ada33e98f5	Add a separate README for the guide demos ... Point users at the actual guide, and also explain about LD_LIBRARY_PATH Reviewed-by: Hugo Landau <hlandau@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/22505)	2023-10-30 07:54:00 +00:00
James Muir	59d8a338ed	quic: documentation and demo nits ... The code for the quic demos (from the openssl guide) is presented as modifications of tls-client-block.c. Make it so that the quic code better matches the tls code (drop unneeded assignments to "ret", use the same comment on SSL_connect(), add the same printf() statement). Also fix some minor typos. Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Hugo Landau <hlandau@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/22483)	2023-10-25 09:44:32 +01:00
Matt Caswell	11b7d46fa7	Return NULL if we fail to create a BIO in the demos/quicserver ... Strictly speaking the previous code was still correct since BIO_set_fd is tolerant of a NULL BIO. But this way is more clear. Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Hugo Landau <hlandau@openssl.org> (Merged from https://github.com/openssl/openssl/pull/21950)	2023-09-08 15:44:37 +01:00
Matt Caswell	cdedecd503	Add a missing call to BIO_closesocket() ... A couple of the demos missed a call to this function in an error case. Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Hugo Landau <hlandau@openssl.org> (Merged from https://github.com/openssl/openssl/pull/21950)	2023-09-08 15:44:37 +01:00
Matt Caswell	38c3c1dbef	Expand the explanation of how to go and do useful work in non-blocking ... Add additional commentary to the non-blocking examples explaining where to add code to go and do other useful work. Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Hugo Landau <hlandau@openssl.org> (Merged from https://github.com/openssl/openssl/pull/21950)	2023-09-08 15:44:37 +01:00
Matt Caswell	e8a5b06bdc	Add a new guide page on writing a non-blocking QUIC client ... Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Hugo Landau <hlandau@openssl.org> (Merged from https://github.com/openssl/openssl/pull/21950)	2023-09-08 15:44:37 +01:00
Matt Caswell	b71784f741	Add a QUIC non-blocking demo ... Show how to write a QUIC client using a non-blocking socket Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Hugo Landau <hlandau@openssl.org> (Merged from https://github.com/openssl/openssl/pull/21950)	2023-09-08 15:44:37 +01:00
Matt Caswell	0295364548	Add a TLS non-blocking demo ... Show how to write a TLS client using a non-blocking socket Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Hugo Landau <hlandau@openssl.org> (Merged from https://github.com/openssl/openssl/pull/21950)	2023-09-08 15:44:37 +01:00
Matt Caswell	dac42bdce1	Fix a bad merge in quic-multi-stream.c demo ... The function SSL_set_initial_peer_addr() got renamed to SSL_set1_initial_peer_addr(). The demo missed out on the rename when it got rebased on top of it. Reviewed-by: Hugo Landau <hlandau@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/21842)	2023-08-28 09:58:20 +02:00
Matt Caswell	02e36ed352	Update demos/tutorial to distinguish between stream and connection errors ... We can use SSL_get_stream_read_state() to distinguish these cases. Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Hugo Landau <hlandau@openssl.org> (Merged from https://github.com/openssl/openssl/pull/21765)	2023-08-25 11:42:51 +01:00
Matt Caswell	8d74a13160	Add some additional comments to the demos ... Add some additional explanation for some code lines in the demos that did not have a comment. Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Hugo Landau <hlandau@openssl.org> (Merged from https://github.com/openssl/openssl/pull/21765)	2023-08-25 11:42:51 +01:00
Matt Caswell	584140fa4b	Add a QUIC multi-stream client demo ... Demonstrate how to use the QUIC multi-stream APIs with a simple blocking client. Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Hugo Landau <hlandau@openssl.org> (Merged from https://github.com/openssl/openssl/pull/21765)	2023-08-25 11:42:51 +01:00