355 Commits

Author	SHA1	Message	Date
openssl-machine	b08f255364	Copyright year updates ... Reviewed-by: Neil Horman <nhorman@openssl.org> Reviewed-by: Saša Nedvědický <sashan@openssl.org> Release: yes	2025-09-30 12:55:37 +00:00
Eugene Syromiatnikov	f2dcb87e8a	demos/certs: properly handle "$@" ... There is little reason $@ should be used unquoted; also, "$@" should be used instead of $* in order to pass the script arguments to a function. Fixes: bcd92754d5 "demos: fix cert scripts" Fixes: 79b184fb4b "Extend certificate creation examples to include CRL generation and sample" Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Paul Dale <ppzgs1@gmail.com> Reviewed-by: Neil Horman <nhorman@openssl.org> (Merged from https://github.com/openssl/openssl/pull/28407) (cherry picked from commit cc8a49004b)	2025-09-08 17:09:39 -04:00
Nachel72	21c3a0dd26	Fix: Add free to avoid memory leak. ... Reviewed-by: Saša Nedvědický <sashan@openssl.org> Reviewed-by: Paul Yang <paulyang.inf@gmail.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Neil Horman <nhorman@openssl.org> (Merged from https://github.com/openssl/openssl/pull/28289) (cherry picked from commit f9afb3a07e)	2025-08-29 08:37:04 -04:00
Quin-Darcy	3874874bfe	Fix RSA key size validation in EVP_PKEY_RSA_keygen demo ... The validation was checking the default 'bits' value (4096) instead of the parsed 'bits_i' from the command line arguments, allowing invalid key sizes to bypass the 512-bit minimum. CLA: trivial Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Shane Lontis <shane.lontis@oracle.com> (Merged from https://github.com/openssl/openssl/pull/28139) (cherry picked from commit c79e1b212a)	2025-08-11 16:46:37 +02:00
Jiasheng Jiang	32a39c30b8	demos/cms/cms_denc.c: Add check for BIO_new_file() ... Add check for the return value of BIO_new_file(). Fixes: 1728756 ("Detached encrypt/decrypt example, fix decrypt sample.") Signed-off-by: Jiasheng Jiang <jiashengjiangcool@gmail.com> Reviewed-by: Paul Dale <ppzgs1@gmail.com> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/27897) (cherry picked from commit 881ff0c225)	2025-07-01 19:35:53 +02:00
Jiasheng Jiang	48ce50a5b5	demos/cms/cms_ddec.c: Replace "in" with "dcont" to correctly check the success of BIO_new_file() ... Replace "in" with "dcont" to properly check the return value of BIO_new_file(). Fixes: 1728756 ("Detached encrypt/decrypt example, fix decrypt sample.") Signed-off-by: Jiasheng Jiang <jiashengjiangcool@gmail.com> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/27896) (cherry picked from commit 8a7545607e)	2025-07-01 19:33:51 +02:00
openssl-machine	c1a2246377	Copyright year updates ... Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Neil Horman <nhorman@openssl.org> Release: yes	2025-07-01 11:59:57 +00:00
Levi Zim	c8358f08ba	Avoid potential double close of client_skt in sslecho ... The server_running variable is declared as volatile and some comments in the code are mentioning about implementing CTRL+C handler in the future. In the client handling loop, the client_skt is closed at the end of the loop if server_running is true. If (future) CTRL+C handler changes server_running to false at this time. The next accept will not happen and the exit clean up code will close client_skt for the second time. This patch fixes this potential double close by setting client_skt back to -1 after closing it. Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/27405) (cherry picked from commit 48e3fe0863)	2025-06-20 15:45:10 +01:00
JiashengJiang	b4402562ba	demos/bio/sconnect.c: Free ssl_bio on error to avoid memory leak ... Call BIO_free() to release ssl_bio if an error occurs before BIO_push(), preventing a memory leak. Fixes: 396e720965 ("Fix certificate validation for IPv6 literals in sconnect demo") Signed-off-by: JiashengJiang <jiasheng@purdue.edu> Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/27639) (cherry picked from commit 55d8d85979)	2025-05-19 16:22:51 +02:00
Benson Muite	bd57c40c7e	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) (cherry picked from commit 10bd6fa8ca)	2025-05-16 12:17:29 +02:00
Tomas Mraz	dd9da9bb95	sslecho: Rename bool to flag to avoid C23 conflict ... Fixes #27516 Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> (Merged from https://github.com/openssl/openssl/pull/27519) (cherry picked from commit 81ce3d3ae8)	2025-04-30 11:50:23 +02:00
Jon Ericson	c7f3e55930	Change documentation to point to new wiki location ... Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/27081) (cherry picked from commit da8de0e8dd)	2025-03-25 20:25:40 +01:00
Alessandro Chitarrini	6a39b4953d	Fix inaccurate comment about default nonce length in demos/cipher/aesccm.c ... Fixes #25270 CLA: trivial Reviewed-by: Neil Horman <nhorman@openssl.org> Reviewed-by: Paul Dale <ppzgs1@gmail.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/25318) (cherry picked from commit f2b7a00fbb)	2024-09-05 17:25:00 +02:00
Tomas Mraz	ecb03cdeaa	Copyright year updates ... Reviewed-by: Neil Horman <nhorman@openssl.org> Release: yes	2024-06-04 14:50:58 +02:00
slontis	92d05708d1	Add demo for ECDH key exchange ... Reviewed-by: Nicola Tuveri <nic.tuv@gmail.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/22916) (cherry picked from commit 56e4d112ae)	2024-04-09 20:15:56 +02:00
Matt Caswell	3764f200f9	Copyright year updates ... Reviewed-by: Neil Horman <nhorman@openssl.org> Release: yes	2024-03-29 14:05:51 +00:00
Jiasheng Jiang	022249e95b	Replace size_t with int and add the check for the EVP_MD_get_size() ... Replace the type of "digest_size" with int to avoid implicit conversion when it is assigned by EVP_MD_get_size(). Moreover, add the check for the "digest_size". Fixes: 29ce1066bc ("Update the demos/README file because it is really old. New demos should provide best practice for API use. Add demonstration for computing a SHA3-512 digest - digest/EVP_MD_demo") Signed-off-by: Jiasheng Jiang <jiasheng@purdue.edu> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Kurt Roeckx <kurt@roeckx.be> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/23924) (cherry picked from commit 87e747000f)	2024-03-25 17:51:45 +01:00
Jiasheng Jiang	22a24b7931	Replace unsigned with int ... Replace the type of "digest_length" with int to avoid implicit conversion when it is assigned by EVP_MD_get_size(). Otherwise, it may pass the following check and cause the integer overflow error when EVP_MD_get_size() returns negative numbers. Signed-off-by: Jiasheng Jiang <jiasheng@purdue.edu> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/23922) (cherry picked from commit f13ddaab69)	2024-03-25 17:46:25 +01:00
sashan	1256250b5c	fix demos/sslecho/main.c so it builds on OpenBSD too ... trying to build `demos/sslecho/main.c` shipped by current openssl fails with error as follows: ``` cc -I../../include -g -Wall -c -o main.o main.c main.c:35:24: error: variable has incomplete type 'struct sockaddr_in' struct sockaddr_in addr; ^ main.c:35:12: note: forward declaration of 'struct sockaddr_in' struct sockaddr_in addr; ^ main.c:46:32: error: use of undeclared identifier 'INADDR_ANY' addr.sin_addr.s_addr = INADDR_ANY; ^ main.c:152:24: error: variable has incomplete type 'struct sockaddr_in' struct sockaddr_in addr; ^ main.c:152:12: note: forward declaration of 'struct sockaddr_in' struct sockaddr_in addr; ^ 3 errors generated. gmake: *** [<builtin>: main.o] Error 1 ``` including `netinet/in.h` fixes the build Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/23936) (cherry picked from commit 01eaf20385)	2024-03-25 13:50:19 +01:00
Richard Levitte	0ce7d1f355	Copyright year updates ... Reviewed-by: Neil Horman <nhorman@openssl.org> Release: yes	2024-03-20 13:07:54 +01:00
Alexandr Nedvedicky	c18c301deb	demos/http3: Use `SSL_write_ex2()` together with `SSL_WRITE_FLAG_CONCLUDE` ... These calls were introduced by PR #23343. Change also does a minor tweak to Makefile so CFLAGS and LDFLAGS variables from the environment are respected. Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/23602)	2024-03-01 10:56:16 +01:00
James Muir	bcd92754d5	demos: fix cert scripts ... set LD_LIBRARY_PATH so the correct libs can be found. Testing: cd demos/certs && sh mkcerts.sh cd demos/certs/apps && sh -x mkacerts.sh Reviewed-by: Neil Horman <nhorman@openssl.org> Reviewed-by: Paul Yang <kaishen.yy@antfin.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/23142)	2023-12-29 10:22:05 +01: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
James Muir	9257a89b6f	cms demos: print signingTime attributes ... Add a makefile for the cms demos, and add a routine to cms_ver.c to print any signingTime attributes from the CMS_ContentInfo object. This provides an example that could be extended if an application wants to examine the purported signing times. Part of #8026 Testing: $ cd demos/cms $ make test Reviewed-by: Shane Lontis <shane.lontis@oracle.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/22618)	2023-11-10 13:06:46 +01:00
James Muir	22fa1602da	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 <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)	2023-11-08 11:12:55 +11: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
Matt Caswell	aefb529422	Update to the demos README file ... 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:53:40 +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
slontis	66f4782f14	Create hierarchical demo Makefile. ... Adds a Makefile with all, clean, and test targets. This has only been added for demos that already contain Makefiles. For problematic tests that require inputs, the test target does nothing. (Note: Demos should be self contained and not require unknown external inputs. This PR does not attempt to fix this.) Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/20546)	2023-10-25 09:21:07 +01:00
Hugo Landau	9f54da4136	Fix markdown ... Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/22369)	2023-10-19 08:28:59 +01:00
Hugo Landau	f92d4a07cc	Add SNI ... Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/22369)	2023-10-19 08:28:59 +01:00
Hugo Landau	17b8f405a2	Rename ... Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/22369)	2023-10-19 08:28:59 +01:00
Hugo Landau	10c04246be	Add link to nghttp3 ... Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/22369)	2023-10-19 08:28:59 +01:00
Hugo Landau	444d18fc7a	Add copyright headers ... Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/22369)	2023-10-19 08:28:59 +01:00
Hugo Landau	47f8cfead0	QUIC: Add comments to HTTP/3 demo ... Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/22369)	2023-10-19 08:28:59 +01:00
Hugo Landau	e33af8000f	QUIC: Add HTTP/3 demo using nghttp3 ... Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/22369)	2023-10-19 08:28:59 +01:00
Dimitri Papadopoulos	e22ebb893e	Bad function definition ... void f() should probably be void f(void) Found by running the checkpatch.pl Linux script to enforce coding style. Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/21468)	2023-09-11 10:15:30 +02:00
Dimitri Papadopoulos	bbaeadb068	"foo * bar" should be "foo *bar" ... Found by running the checkpatch.pl Linux script to enforce coding style. Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/21468)	2023-09-11 10:15:30 +02: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	da1c088f59	Copyright year updates ... Reviewed-by: Richard Levitte <levitte@openssl.org> Release: yes	2023-09-07 09:59:15 +01:00