openssl/apps, branch openssl-4.0

apps/lib/cmp_mock_srv.c: Fix NULL dereference of ASN1_INTEGER in refcert_cmp()

2026-10-24T09:58:44Z

The issuer and the serialNumber are independently OPTIONAL in a CertTemplate. A component absent from the request cannot confirm a match with the reference cert, and ASN1_INTEGER_cmp() does not accept NULL, so require each component the reference cert has to be present in the request and to be equal. Fixes: 66be663b64e0 "cmp_mock_srv.c: Add missing OldCertID check for 'kur' cert update requests" References: b971d4198def "CMP mock server: add -ref_cert option and corresponding ossl_cmp_mock_srv_set1_refCert()" Reviewed-by: Dmitry Belyavskiy Reviewed-by: Mounir Idrassi Reviewed-by: Eugene Syromiatnikov Merge-date: Sat Oct 24 09:44:19 2026 Merged-from: https://github.com/openssl/openssl/pull/33071 (cherry picked from commit 0e2a7f23387cf7b7cd22832c1f5bdc1200683d6e)

Fix set but unsued variable in lib/opt.c

2026-10-12T07:37:10Z

https://github.com/openssl/openssl/actions/runs/34494520852/job/102982686286 CI is failing because we have a varaible in opt.c that is set but never used. Just remove it. Reviewed-by: Andrew Dinh Reviewed-by: Frederik Wedel-Heinen MergeDate: Sat Sep 12 13:18:16 2026 Reviewed-by: Mounir Idrassi Reviewed-by: Eugene Syromiatnikov Merged-from: https://github.com/openssl/openssl/pull/33194 (cherry picked from commit eadfce0e20dafd9a9bc8232caf84c4c9498ea667)

apps/s_server.c: fix BIO leak in ech_load_dir() on read failure

2026-10-09T20:01:48Z

When loading ECH keys from a directory (-ech_dir or -ech_noretry_dir), ech_load_dir() allocated a BIO via BIO_new_file(), but only freed it on the success path. If a file was readable, yet OSSL_ECHSTORE_read_pem() failed, the continue skipped BIO_free_all(), leaking the BIO. OSSL_ECHSTORE_read_pem() does not take ownership of the caller-supplied BIO. It pushes and pops its own internal buffer BIO, so the caller remains responsible for freeing the file BIO in all cases. Fix this by making the BIO local to each loop iteration and freeing it in the failure branch as well as the success branch. This also avoids carrying a dangling BIO pointer from one loop iteration to the next. Verified with Valgrind against a directory containing invalid ECH PEM files: definitely lost: 0 bytes, previously leaked 128 bytes per failing file. Resolves: https://github.com/openssl/openssl/issues/31770 Fixes: a2e5848d9d11 "s_client and s_server options for ECH" Reviewed-by: Daniel Kubec Reviewed-by: Andrew Dinh Reviewed-by: Eugene Syromiatnikov Merge-date: Fri Oct 9 19:55:28 2026 Merged-from: https://github.com/openssl/openssl/pull/31790 (cherry picked from commit 41a2d15da05c6f9d453ff270ea4571f5001c7e4a)

Fix typos

2026-10-09T18:38:14Z

Found by typos[1]. [1] https://github.com/crate-ci/typos CLA: trivial Reviewed-by: Shane Lontis Reviewed-by: Paul Dale Reviewed-by: Tim Hudson Reviewed-by: Norbert Pocs Reviewed-by: Eugene Syromiatnikov MergeDate: Wed Jul 8 10:46:01 2026 Original-PR: https://github.com/openssl/openssl/pull/31858 Reviewed-by: Daniel Kubec Reviewed-by: Kurt Roeckx Merged-from: https://github.com/openssl/openssl/pull/33143

apps/x509.c: don't load extensions if no -extfile/-extensions/"extensions" opt

2026-10-05T10:10:26Z

The documentation says "If neither of the options are given, an attempt is made to open the default configuration file [..] If the unnamed section [..] of the file does not list an B variable, no extensions are added"; however, an attempt was made to load extensions in that case. Avoid that by using non-NULL extsect as a guard for do_EXT_REQ_add_nconf() and do_EXT_REQ_add_nconf() calls (which also avoids passing NULL as an "%s" format qualifier argument to BIO_printf() calls in case of load failure). Fixes: 84419e373ac1 "Improved handling of AKID/SKID extensions in CSRs and certs" Signed-off-by: Eugene Syromiatnikov Reviewed-by: Neil Horman Reviewed-by: Jakub Zelenka Reviewed-by: Bob Beck Reviewed-by: Viktor Dukhovni Merge-date: Mon Oct 5 10:09:56 2026 Merged-from: https://github.com/openssl/openssl/pull/33083 (cherry picked from commit 82eef37eb9c1111e24dec960a5c7d10ffb122fb0)

apps/x509: Fix new output detection for -key signing

2026-09-25T11:10:10Z

The signing-only option validation runs before load_key(), so privkey is always NULL when determining newout. Consequently, -key or -signkey alone does not identify re-signing an input certificate or signing an -x509toreq output. Signing options are rejected, and the default extensions section is not loaded. Check privkeyfile at this stage, which records that the option was supplied. Keep the later privkey check unchanged because the key has been loaded by then. Add tests for the validation guard, re-signing options, and certificate and request extensions. Fixes #32150 Assisted-by: pi:kimi-k3 Reviewed-by: Tomas Mraz Reviewed-by: Jakub Zelenka Merge-date: Fri Sep 25 11:10:17 2026 Merged-from: https://github.com/openssl/openssl/pull/32151

Fix a memory leak in apps/ocsp.c issuer

2026-09-15T16:32:04Z

Reviewed-by: Shane Lontis Reviewed-by: Paul Dale Reviewed-by: Paul Yang Merge-date: Tue Sep 15 16:28:52 2026 Merged-from: https://github.com/openssl/openssl/pull/32807 (cherry picked from commit 3bdd4a655bd707f66a7ea620ffae88afc3e15fa7)

apps: print an error for a non-positive genrsa bits argument

2026-09-15T15:19:56Z

Previously a negative or zero numbits argument made genrsa exit with a failure status without printing any error message. Assisted-by: Claude:claude-fable-5 Reviewed-by: Daniel Kubec Reviewed-by: Richard Levitte Merge-date: Tue Sep 15 15:20:10 2026 Merged-from: https://github.com/openssl/openssl/pull/32593

apps/x509.c: failing exit status on every failure path reaching err:

2026-09-07T14:05:06Z

With -multi, a later certificate failure could return success after an earlier certificate succeeded because ret retained the earlier result on reaching err:. Set ret = 1 at err: so every path reaching it reports failure. Paths bypassing err: remain unchanged, including the pre-existing X509_VERIFY_PARAM_new() failure under -checkend, which will be addressed separately. Add a regression test using -multi -checkhost with a two-certificate chain whose second certificate fails. Fixes #32189 Reviewed-by: Jakub Zelenka Reviewed-by: Todd Short Merge-date: Mon Sep 7 14:01:00 2026 Merged-from: https://github.com/openssl/openssl/pull/32190 (cherry picked from commit 8da3880874acaac2e338665f216e430f78f976f1)

s_server: Do not override -Verify with -verify_return_error

2026-08-27T16:15:50Z

Or the verification flags in instead of overriding the previous value with -verify_return_error. Fixes e5f01903ed7 Reviewed-by: Milan Broz Reviewed-by: Dmitry Belyavskiy Merge-date: Thu Aug 27 16:15:34 2026 Merged-from: https://github.com/openssl/openssl/pull/32512 (cherry picked from commit d2307ad06d5510352ce2fc9ad2c87461fd60966a)