openssl/util, branch master

util/libcrypto.num, doc/man3/X509_dup.pod: fix version for IPAddrBlock functions

2026-10-09T18:33:37Z

These have ultimately been introduced during OpenSSL 4.2 development time frame. Fixes: f08174e91476 "Add public API for IPAddrBlocks (RFC 3779)" Signed-off-by: Eugene Syromiatnikov Reviewed-by: Nikola Pajkovsky Reviewed-by: Daniel Kubec Merge-date: Fri Oct 9 18:33:51 2026 Merged-from: https://github.com/openssl/openssl/pull/32956

util/libcrypto.num: add function number assignments from openssl-4.1

2026-10-09T18:33:37Z

This is a partial forward-port of commit d5772c7954d7 "make update" from openssl-4.1 branch, that assigns function numbers to the new functions introduced during 4.1 development time frame in libcrypto. Original-Commit: d5772c7954d7 "make update" Original-PR: https://github.com/openssl/openssl/pull/32953 Reviewed-by: Nikola Pajkovsky Reviewed-by: Daniel Kubec Reviewed-by: Eugene Syromiatnikov Merge-date: Fri Oct 9 18:33:50 2026 Merged-from: https://github.com/openssl/openssl/pull/32956

Revert "Don't let stderr block when filling up."

2026-10-06T16:03:53Z

This reverts commit 0fff0090507a205e6d37072d6ea151b68d0f74b6. That commit discarded command stderr without an explicit redirection under the default non-verbose harness. This hides diagnostics, including LeakSanitizer reports from failing commands in sanitizer CI jobs. Restore command stderr to the harness's existing reporting path, retaining the VMS-only null-device redirection and explicit recipe redirections. The harness can then show diagnostics for failed assertions, including when a command succeeds but an assertion about its captured stdout fails. Passing full-suite runs produced no additional diagnostic output. This depends on the preceding callback fix. Without it, restoring stderr also restores quadratic processing of that output. On Linux, the fix removes a slowdown with the blocked-writer signature reported in #32128. Native OpenBSD and macOS confirmation remains outstanding. Assisted-by: Claude Code:claude-opus-5-5 Assisted-by: Codex:gpt-6-astra Reviewed-by: Jakub Zelenka Reviewed-by: Nikola Pajkovsky Reviewed-by: Tomas Mraz Merge-date: Tue Oct 6 16:04:02 2026 Merged-from: https://github.com/openssl/openssl/pull/33078

dtls: honour SSL_OP_COOKIE_EXCHANGE for DTLS 1.3

2026-10-06T14:46:47Z

Setting SSL_OP_COOKIE_EXCHANGE on a server connection only ever produced a HelloVerifyRequest, so once the peer negotiated DTLS 1.3 the option was silently ignored and the client was accepted without any address validation. The HelloRetryRequest cookie code was gated purely on the internal stateless flag, which only SSL_stateless() and the DTLS listener set, leaving no way for an application driving its own per-peer SSL objects with SSL_accept() to get a cookie exchange. Treat the option as "a cookie is required" for DTLS 1.3 as well. A ClientHello without a valid cookie is answered with a HelloRetryRequest carrying one, and the handshake continues only once it is echoed back. The stateless cookie callbacks are used for the application part of the cookie, falling back to the HelloVerifyRequest callbacks so existing servers written for DTLS 1.2 keep working unchanged. A client that repeats its ClientHello after the HelloRetryRequest and still presents no valid cookie now gets an illegal_parameter alert rather than tripping an internal error. The listener is unaffected since it sets both the flag and the option. s_server always sets the option for DTLS, so teach the TLSProxy handshake checker that every DTLS handshake now starts with a cookie round trip. Add a test covering the 1.2 and 1.3 paths, the callback fallback, the missing-callback failure and the PSK-only resumption, and make the dtlsecho demo server validate its peer this way. Assisted-by: Claude:claude-fable-5-1 Reviewed-by: Matt Caswell Reviewed-by: Mounir Idrassi Reviewed-by: Tomas Mraz Merge-date: Tue Oct 6 14:46:56 2026 Merged-from: https://github.com/openssl/openssl/pull/33093

Deprecate X509_OBJECT_up_ref_count()

2026-10-02T08:08:58Z

Despite its name, X509_OBJECT_up_ref_count() does not reference count the X509_OBJECT itself. With X509_OBJECT being opaque there is nothing useful an application can do with it. Assisted-by: Claude:claude-fable-5-1 Fixes #21121 Reviewed-by: Frederik Wedel-Heinen Reviewed-by: Tomas Mraz Merge-date: Fri Oct 2 08:09:09 2026 Merged-from: https://github.com/openssl/openssl/pull/32823

paramnames: Add support for constant FIPS indicators

2026-09-26T21:22:57Z

When the parameter generator sees the special field name "fips indicator", it adds the indicator to the gettable parameter list only under FIPS_MODULE and auto-generates decoder code equivalent to: if (strcmp("fips-indicator", s) == 0) { if (!OSSL_PARAM_set_int((OSSL_PARAM *)p, 1)) return 0; } No result structure field is needed for this constant parameter. If no real fields remain, emit a dummy member to avoid generating an empty C structure. Reviewed-by: Milan Broz Reviewed-by: Norbert Pocs Merge-date: Sat Sep 26 21:24:09 2026 Merged-from: https://github.com/openssl/openssl/pull/32910

Suppress asn1 string nul byte poisoning test on valgrind

2026-09-25T13:37:11Z

This test is explicitly written to fail. Suppress. Signed-off-by: Norbert Pocs Reviewed-by: Richard Levitte Reviewed-by: Milan Broz Merge-date: Fri Sep 25 13:37:15 2026 Merged-from: https://github.com/openssl/openssl/pull/32992

Add support for Java keytool PKCS#12 files with symmetric secret keys

2026-09-24T07:25:11Z

Introduce PKCS12_PARSE_CTX opaque context for PKCS12_parse_ex(), replacing the growing parameter list pattern. Add PKCS12_decrypt_secretbag() for decrypting secret bags and PKCS12_SAFEBAG_get1_skey() for converting decrypted PKCS8 data to EVP_SKEY, following the existing private key pattern (PKCS12_decrypt_skey_ex + EVP_PKCS82PKEY_ex). Assisted-by: Claude Opus 4.6 Reviewed-by: Mounir Idrassi Reviewed-by: Simo Sorce MergeDate: Thu Sep 24 07:34:22 2026 (Merged from https://github.com/openssl/openssl/pull/30937)

TLSProxy: track message reassembly per sender, not globally

2026-09-21T09:41:03Z

TLSProxy::Message::get_messages() kept a single set of reassembly buffers shared between the client and the server, even though DTLS legitimately allows each side to have its own in-flight, independently fragmented handshake message at the same time. When a peer switch happened while the other side's fragment was still incomplete (e.g. the client's fatal alert reaching the proxy before the server's second CertificateVerify datagram), the previous code discarded the buffered fragment to avoid a crash. That stops the die(), but the discarded bytes are unrecoverable: when the server's real second datagram arrives afterward, it is reparsed as the start of a brand new message instead of its continuation, and buffers forever waiting for a first half that will never arrive. In a live run that is indistinguishable from a hang until Proxy.pm's "no progress" counter trips, i.e. an intermittent, timing-dependent test failure rather than a clean crash. Give the client and server independent reassembly state instead, so a record from one peer can never observe or clobber the other peer's in-progress fragment. The special-cased "changed peer" discard/die branch is no longer needed and is removed. Assisted-by: Claude:claude-sonnet-5 Reviewed-by: Frederik Wedel-Heinen Reviewed-by: Tomas Mraz Merge-date: Mon Sep 21 09:41:08 2026 Merged-from: https://github.com/openssl/openssl/pull/32831

Make system exec directly rather than calling /bin/sh

2026-09-17T16:46:27Z

When perl uses system() to call an external binary, if the argument is a single array, perl uses /bin/sh and passes the entire argument as the command line (i.e. /bin/sh -c @ARGV) This is normally fine, but on platforms in which /bin/sh is an older shell, @ARGV can easily overflow the command line space (e.g. on nonstop). Instead, shift off the first argument, then call system(argv[0], @ARGV). This forces perl to call exec directly, rather than using the shell, avoiding that. Fixes #32778 Reviewed-by: Eugene Syromiatnikov Reviewed-by: Andrew Dinh Reviewed-by: Nikola Pajkovsky Merge-date: Thu Sep 17 16:46:28 2026 Merged-from: https://github.com/openssl/openssl/pull/32816