]> git.ipfire.org Git - thirdparty/openssl.git/log
thirdparty/openssl.git
15 hours agoinclude C++ extern in ech.h master
sftcd [Mon, 13 Apr 2026 00:43:04 +0000 (01:43 +0100)] 
include C++ extern in ech.h

Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Norbert Pocs <norbertp@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
MergeDate: Mon Apr 13 09:57:10 2026
(Merged from https://github.com/openssl/openssl/pull/30790)

15 hours agoSkip parsing OCSP status_request when no status call is registered
Brenda So [Mon, 30 Mar 2026 21:32:47 +0000 (14:32 -0700)] 
Skip parsing OCSP status_request when no status call is registered

When no ext.status_cb is set, the server will not produce a stapled
OCSP response. This patch returns early from tls_parse_ctos_status_request
before parsing the extension body to save memory.

Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
MergeDate: Mon Apr 13 09:40:08 2026
(Merged from https://github.com/openssl/openssl/pull/30630)

15 hours agoWe now have ml-dsa asm, add it to fips-checksums
Tomas Mraz [Thu, 19 Mar 2026 09:58:56 +0000 (10:58 +0100)] 
We now have ml-dsa asm, add it to fips-checksums

We also add other PQC algorithm directories that might
appear in future so they are picked-up by the script
once they appear. This requires checking whether the
directory exists.

Also update the fips sources and checksums.

Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
MergeDate: Mon Apr 13 09:35:17 2026
(Merged from https://github.com/openssl/openssl/pull/30502)

15 hours agoapps : enforce command-line parameter checking.
F. R. Da Silva [Thu, 26 Mar 2026 23:09:23 +0000 (00:09 +0100)] 
apps : enforce command-line parameter checking.

Improve 'verify' option help messages.

integer value parsing formats are:
- 'n' is any integer
- 'N' is a non-negative integer (i.e. value >= 0)
- 'p' is a positive integer (i.e. value > 0)

Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Frederik Wedel-Heinen <fwh.openssl@gmail.com>
MergeDate: Mon Apr 13 09:30:22 2026
(Merged from https://github.com/openssl/openssl/pull/30476)

15 hours agoapps: remove atoi() calls.
Filipe R. Da Silva [Sun, 15 Mar 2026 20:55:42 +0000 (21:55 +0100)] 
apps: remove atoi() calls.

Related to #8216

Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Frederik Wedel-Heinen <fwh.openssl@gmail.com>
MergeDate: Mon Apr 13 09:30:21 2026
(Merged from https://github.com/openssl/openssl/pull/30476)

16 hours agoPrecompute some helper objects in each SSL_CTX
Viktor Dukhovni [Tue, 7 Apr 2026 11:46:58 +0000 (21:46 +1000)] 
Precompute some helper objects in each SSL_CTX

Instead of repeated fetching, precompute the below per the library
context and properties of the SSL_CTX and use them for the lifetime of
the SSL_CTX.

    - HMAC algorithm handle (session ticket HMAC)
    - SHA2-256 algorithm handle (session ticket HMAC)
    - AES_256-CBC algorithm handle (session ticket en/decryption)
    - TLS1 PRF (when TLS <= 1.2 is supported)

The "sha1" and "md5" handles are no longer used, and those fields are
removed.

The `SSL_HMAC` objects used internally are now stack allocated, and the
associated "new" and "free" functions are now called "construct" and
"destruct" respectively.

Reviewed-by: Matt Caswell <matt@openssl.foundation>
Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
MergeDate: Mon Apr 13 09:03:45 2026
(Merged from https://github.com/openssl/openssl/pull/30696)

16 hours agoFix no-dtls1_2 test failure
Matt Caswell [Tue, 7 Apr 2026 14:39:42 +0000 (15:39 +0100)] 
Fix no-dtls1_2 test failure

Fix a failure with no-dtls1_2 introduced by the test in #30503

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Mon Apr 13 08:59:03 2026
(Merged from https://github.com/openssl/openssl/pull/30704)

16 hours agoci: Use jom to parallize Windows builds
Milan Broz [Sun, 5 Apr 2026 19:24:28 +0000 (21:24 +0200)] 
ci: Use jom to parallize Windows builds

The jom version in choco install is obsolete,
but it works fine for CI.

Users should use jom 1.1.7 or more recent.

Signed-off-by: Milan Broz <gmazyland@gmail.com>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Norbert Pocs <norbertp@openssl.org>
MergeDate: Mon Apr 13 08:46:21 2026
(Merged from https://github.com/openssl/openssl/pull/30703)

16 hours agoWindows: Use /Z7 compiler flag to enable parallel builds
Milan Broz [Thu, 2 Apr 2026 10:51:46 +0000 (12:51 +0200)] 
Windows: Use /Z7 compiler flag to enable parallel builds

MSVC compilation on Windows cannot be reliably parallelized
with tools like jom (an nmake replacement) due to contention
on shared .pdb files used for debug info. Writes to a shared
.pdb must be serialized.

The /FS compiler flag serializes concurrent compiler writes,
but does not resolve contention when the compiler and linker
access the same .pdb file. With shared .pdb files (e.g. app.pdb),
the makefile does not prevent races between the linker and
compilation of multiple targets.

This can be resolved either by restructuring the makefile
to introduce sentinel dependencies that serialize the conflicting
steps, or by eliminating the shared .pdb entirely.

This patch takes the latter approach: it replaces /Zi with /Z7,
which embeds debug info directly into each .obj file and avoids
any shared-file contention. /Z7 is supported by all MSVC versions.

The linker-generated .pdb is unaffected.

Side effects: object files are slightly larger, and all .pdb files
are now named after their target — the shared app.pdb, ossl_static.pdb,
and dso.pdb no longer exist.

With this change, jom can be used to parallelize the build.

Fixes: #9931
Signed-off-by: Milan Broz <gmazyland@gmail.com>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Norbert Pocs <norbertp@openssl.org>
MergeDate: Mon Apr 13 08:46:20 2026
(Merged from https://github.com/openssl/openssl/pull/30703)

17 hours agoOSSL_PARAM_BLD_push_octet_*(): Allow NULL buffer with 0 bsize
Tomas Mraz [Wed, 8 Apr 2026 15:38:51 +0000 (17:38 +0200)] 
OSSL_PARAM_BLD_push_octet_*(): Allow NULL buffer with 0 bsize

Fixes #30728

Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
MergeDate: Mon Apr 13 07:47:44 2026
(Merged from https://github.com/openssl/openssl/pull/30730)

17 hours agoRemove duplicate function asn1_bit_string_set_unused_bits
Norbert Pocs [Mon, 6 Apr 2026 12:34:08 +0000 (14:34 +0200)] 
Remove duplicate function asn1_bit_string_set_unused_bits

Signed-off-by: Norbert Pocs <norbertp@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
MergeDate: Mon Apr 13 07:11:12 2026
(Merged from https://github.com/openssl/openssl/pull/30746)

17 hours agoRename ossl_asn1_string_set_bits_left to something more expressive
Norbert Pocs [Mon, 6 Apr 2026 12:30:03 +0000 (14:30 +0200)] 
Rename ossl_asn1_string_set_bits_left to something more expressive

Signed-off-by: Norbert Pocs <norbertp@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
MergeDate: Mon Apr 13 07:11:11 2026
(Merged from https://github.com/openssl/openssl/pull/30746)

2 days agoquic: fix NULL txl dereference in qtx_resize_txe
Nikolas Gauder [Tue, 17 Mar 2026 19:29:28 +0000 (20:29 +0100)] 
quic: fix NULL txl dereference in qtx_resize_txe

Fixes: 1957148384c7 "QUIC Record Layer (Refactor and TX Side)"
Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
MergeDate: Sat Apr 11 20:55:10 2026
(Merged from https://github.com/openssl/openssl/pull/30474)

2 days agostyle: fix clang-format issues in chacha_internal_test.c
Samaresh Kumar Singh [Thu, 2 Apr 2026 20:16:56 +0000 (15:16 -0500)] 
style: fix clang-format issues in chacha_internal_test.c

Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
MergeDate: Sat Apr 11 20:06:07 2026
(Merged from https://github.com/openssl/openssl/pull/30587)

2 days agotest/chacha: added ELFv2 ABI FPR preservation check for POWER10 8x path
Samaresh Kumar Singh [Sat, 28 Mar 2026 21:38:35 +0000 (16:38 -0500)] 
test/chacha: added ELFv2 ABI FPR preservation check for POWER10 8x path

On POWER10, ChaCha20_ctr32_vsx_8x is activated for buffers over 255
bytes and uses vxxlor to alias FPR14-FPR25 as temporary storage. Add a
test to chacha_internal_test that pins known values in f14-f25 via
inline asm, calls through ChaCha20_ctr32 with a 512-byte buffer to
trigger the 8x path, and verifies the registers still hold their
original values. The test is gated on PPC_BRD31 (POWER10 capability
flag) so it is skipped silently on older hardware.

Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
MergeDate: Sat Apr 11 20:06:05 2026
(Merged from https://github.com/openssl/openssl/pull/30587)

2 days agochacha/asm: save f17 in 8x prologue for contiguous f14-f25 range
Samaresh Kumar Singh [Sat, 28 Mar 2026 19:43:47 +0000 (14:43 -0500)] 
chacha/asm: save f17 in 8x prologue for contiguous f14-f25 range

f17 is not directly clobbered by any vxxlor in this function, but
saving the full contiguous range f14-f25 is cleaner and avoids any
future ambiguity if the code is modified. Adjust all subsequent FPR
slot offsets and the VMX base offset accordingly, and update the frame
size comment.

Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
MergeDate: Sat Apr 11 20:06:04 2026
(Merged from https://github.com/openssl/openssl/pull/30587)

2 days agochacha/asm: fix ELFv2 ABI violation in ChaCha20_ctr32_vsx_8x
Samaresh Kumar Singh [Thu, 26 Mar 2026 14:19:22 +0000 (09:19 -0500)] 
chacha/asm: fix ELFv2 ABI violation in ChaCha20_ctr32_vsx_8x

The 8-block POWER10 ChaCha20 path uses vxxlor to spill VMX values into
VSR0-VSR26, which aliases FPR0-FPR26. FPR14-FPR31 are callee-saved per
the ELFv2 ABI, but the function was never saving or restoring them,
silently corrupting 11 FPRs (12 on big-endian) across any call with a
buffer larger than 255 bytes. VMX registers v20-v23, also
callee-saved, had the same problem.

Fix by increasing the frame size to accommodate save slots for
FPR14-FPR25 (and FPR26 on BE) and VMX v20-v23, and adding the
corresponding stfd/lfd and stvx/lvx pairs in the prologue and
epilogue. The VRSAVE save offset is updated to a fixed expression so
it stays clear of the new save area.

Fix for the bug #30584

Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
MergeDate: Sat Apr 11 20:06:02 2026
(Merged from https://github.com/openssl/openssl/pull/30587)

2 days agodoc: updates no-pinshared description
Ethan [Fri, 27 Mar 2026 19:15:52 +0000 (15:15 -0400)] 
doc: updates no-pinshared description

The current documentation heavily references the now removed
`atexit()` handlers. This updates the description to better reflect
it's current utility (removal of `-Wl,-znodelete` linker flags on
Linux and Hurd).

Fixes #30586

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Saša Nedvědický <sashan@openssl.org>
MergeDate: Sat Apr 11 19:44:00 2026
(Merged from https://github.com/openssl/openssl/pull/30606)

2 days agoSetting statem.error_state more carefully
Igor Ustinov [Tue, 31 Mar 2026 14:35:49 +0000 (16:35 +0200)] 
Setting statem.error_state more carefully

Reviewed-by: Matt Caswell <matt@openssl.foundation>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Sat Apr 11 19:31:39 2026
(Merged from https://github.com/openssl/openssl/pull/30647)

2 days agoSSL_use_cert_and_key NPE with provided keys
Viktor Dukhovni [Sat, 4 Apr 2026 14:19:07 +0000 (01:19 +1100)] 
SSL_use_cert_and_key NPE with provided keys

SSL_use_cert_and_key(3) dereferenced a NULL SSL_CTX pointer
via ssl_cert_lookup_by_pkey() when the private key type was
not one of the builtin ones, but was provider-based.

Bug introduced in Postfix 3.2 (commit ee58915cfd9).

Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
MergeDate: Sat Apr 11 19:04:12 2026
(Merged from https://github.com/openssl/openssl/pull/30683)

2 days agoCHANGES.md, NEWS.md: update for 3.6.2
Eugene Syromiatnikov [Sun, 5 Apr 2026 10:54:45 +0000 (12:54 +0200)] 
CHANGES.md, NEWS.md: update for 3.6.2

3.6.2 CHANGES.md includes the following:
 * CVE-2026-2673, CVE-2026-28386, CVE-2026-28387, CVE-2026-28388,
   CVE-2026-28389, CVE-2026-28390, CVE-2026-31789, CVE-2026-31790
 * https://github.com/openssl/openssl/pull/30384
   "Fix #19891 CONNECT request for IPv6 targets in OSSL_HTTP_proxy_connect"
 * https://github.com/openssl/openssl/pull/30411
   "Fix detection of plaintext HTTP over TLS (3.6/3.5 backport)"
 * https://github.com/openssl/openssl/pull/30557
   "re-constructorize the cpuid stuff, but fix riscv to not depend
   on BIO_snprintf."

3.6.2 NEWS.md includes the following:
 * CVE-2026-2673, CVE-2026-28386, CVE-2026-28387, CVE-2026-28388,
   CVE-2026-28389, CVE-2026-28390, CVE-2026-31789, CVE-2026-31790

Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
MergeDate: Sat Apr 11 18:51:42 2026
(Merged from https://github.com/openssl/openssl/pull/30720)

2 days agocurl ECH+QUIC fix
sftcd [Wed, 8 Apr 2026 10:11:37 +0000 (11:11 +0100)] 
curl ECH+QUIC fix

Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
Reviewed-by: Matt Caswell <matt@openssl.foundation>
MergeDate: Sat Apr 11 18:29:37 2026
(Merged from https://github.com/openssl/openssl/pull/30727)

2 days agoFix off-by-one s_client overflows
Matt Caswell [Wed, 8 Apr 2026 15:36:42 +0000 (16:36 +0100)] 
Fix off-by-one s_client overflows

There are one byte buffer overflows possible in s_client's handling
of STARTTLS in various protocols. If a server's response fills the entire
buffer (16k) then we attempt to add a NUL terminator one byte off the end
of the buffer.

This was reported by Igor Morgenstern from AISLE to openssl-security and
assessed by the security team as "bug or hardening only".

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
MergeDate: Sat Apr 11 16:16:24 2026
(Merged from https://github.com/openssl/openssl/pull/30731)

3 days agoUpdate apps/lib/s_cb.c
Sashan [Wed, 1 Apr 2026 06:32:46 +0000 (08:32 +0200)] 
Update apps/lib/s_cb.c

Co-authored-by: Bob Beck <beck@obtuse.com>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Fri Apr 10 12:22:48 2026
(Merged from https://github.com/openssl/openssl/pull/30596)

3 days agoUpdate apps/lib/s_cb.c
Sashan [Wed, 1 Apr 2026 06:28:31 +0000 (08:28 +0200)] 
Update apps/lib/s_cb.c

Co-authored-by: Bob Beck <beck@obtuse.com>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Fri Apr 10 12:22:46 2026
(Merged from https://github.com/openssl/openssl/pull/30596)

3 days agofix BIO_vsnprintf() with NULL string arg crash on Solaris 10
Alexandr Nedvedicky [Fri, 27 Mar 2026 08:33:07 +0000 (09:33 +0100)] 
fix BIO_vsnprintf() with NULL string arg crash on Solaris 10

Issue was kindly reported and fixes suggested by @rainerjung

Fixes #30402

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Fri Apr 10 12:22:44 2026
(Merged from https://github.com/openssl/openssl/pull/30596)

5 days agoImprove PBKDF2 password strength too weak error message with arguments
Jun Aruga [Mon, 30 Mar 2026 17:21:18 +0000 (18:21 +0100)] 
Improve PBKDF2 password strength too weak error message with arguments

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
MergeDate: Wed Apr  8 10:34:20 2026
(Merged from https://github.com/openssl/openssl/pull/30628)

5 days agoevp_skey_test.c: Add test for EVP_SKEY_to_provider cross-provider transfer
Joshua Rogers [Sat, 4 Apr 2026 10:28:46 +0000 (18:28 +0800)] 
evp_skey_test.c: Add test for EVP_SKEY_to_provider cross-provider transfer

Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Frederik Wedel-Heinen <fwh.openssl@gmail.com>
MergeDate: Wed Apr  8 10:27:04 2026
(Merged from https://github.com/openssl/openssl/pull/30650)

5 days agoevp_skey_test.c: Add test for EVP_SKEY_to_provider same-provider path
Joshua Rogers [Sat, 4 Apr 2026 09:55:34 +0000 (17:55 +0800)] 
evp_skey_test.c: Add test for EVP_SKEY_to_provider same-provider path

Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Frederik Wedel-Heinen <fwh.openssl@gmail.com>
MergeDate: Wed Apr  8 10:27:03 2026
(Merged from https://github.com/openssl/openssl/pull/30650)

5 days agos_lib.c: Fix refcount leak in EVP_SKEY_to_provider
Joshua Rogers [Tue, 31 Mar 2026 16:02:11 +0000 (00:02 +0800)] 
s_lib.c: Fix refcount leak in EVP_SKEY_to_provider

Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Frederik Wedel-Heinen <fwh.openssl@gmail.com>
MergeDate: Wed Apr  8 10:27:02 2026
(Merged from https://github.com/openssl/openssl/pull/30650)

5 days agoOPENSSL_secure_malloc.pod: mention CRYPTO_secure_actual_size()
Eugene Syromiatnikov [Mon, 30 Mar 2026 08:30:41 +0000 (10:30 +0200)] 
OPENSSL_secure_malloc.pod: mention CRYPTO_secure_actual_size()

Add mentions to NAME, SYNOPSIS, and RETURN VALUES, and provide a short
description (that it is identical to its OPENSSL_* counterpart)
to DESCRIPTION.

Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Wed Apr  8 10:23:57 2026
(Merged from https://github.com/openssl/openssl/pull/30623)

5 days agoOPENSSL_malloc.pod: mention CRYPTO_memdup()
Eugene Syromiatnikov [Mon, 30 Mar 2026 08:27:35 +0000 (10:27 +0200)] 
OPENSSL_malloc.pod: mention CRYPTO_memdup()

Add its mentions to NAME, SYNOPSIS, and RETURN VALUES sections.
Also, while at it, put OPENSSL_{str,strn,mem}dup() with the other
OPENSSL_* interfaces, and add mentions of OPENSSL_str{,n}dup()
to RETURN VALUES.

Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Wed Apr  8 10:23:55 2026
(Merged from https://github.com/openssl/openssl/pull/30623)

5 days agoOPENSSL_malloc.pod: mention CRYPTO_aligned_alloc{,_array}() in RETURN VALUES
Eugene Syromiatnikov [Mon, 30 Mar 2026 08:10:35 +0000 (10:10 +0200)] 
OPENSSL_malloc.pod: mention CRYPTO_aligned_alloc{,_array}() in RETURN VALUES

Addition of those has been originally overlooked.

Complements: cc4ea5e00028 "Introduce new internal hashtable implementation"
Complements: fa9b7b930e3e "Add array memory allocation routines"
Complements: 14a24fd14ff7 "doc/man3/OPENSSL_malloc.pod: explicitly document freeptr value on failures"
Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Wed Apr  8 10:23:55 2026
(Merged from https://github.com/openssl/openssl/pull/30623)

5 days agoquic: remove unused scid from port_default_packet_handler
Sunwoo Lee [Fri, 27 Mar 2026 23:58:41 +0000 (08:58 +0900)] 
quic: remove unused scid from port_default_packet_handler

  Remove the scid variable entirely from port_default_packet_handler()
  and all functions that accept it as a parameter. The scid was never
  used meaningfully — cur_remote_dcid is set later during the handshake.

  Remove scid parameter from:
    - port_bind_channel()
    - port_validate_token()
    - ossl_quic_channel_on_new_conn()
    - ossl_quic_bind_channel()
    - ch_on_new_conn_common()

  Remove the cur_remote_dcid = *peer_scid assignment in
  ch_on_new_conn_common() as it wrote dead data.

  CWE-457

Reported-by: Sunwoo Lee <sunwoolee@kentech.ac.kr>
  CLA: trivial

Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Frederik Wedel-Heinen <fwh.openssl@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Wed Apr  8 10:21:55 2026
(Merged from https://github.com/openssl/openssl/pull/30611)

5 days agocrypto/pkcs12/p12_add.c: Restore ERR_set_mark and ERR_pop_to_mark
Jun Aruga [Fri, 27 Mar 2026 18:16:55 +0000 (18:16 +0000)] 
crypto/pkcs12/p12_add.c: Restore ERR_set_mark and ERR_pop_to_mark

The commit <2ea6e785f526f88f913cc6f49372aae9dc54bc63> removed the
ERR_set_mark and ERR_pop_to_mark calls before and after the EVP_CIPHER_fetch
call in several files.

However, in PKCS12_pack_p7encdata_ex, crypto/pkcs12/p12_add.c, there is a valid
case that EVP_CIPHER_fetch returns NULL, raising an error, and calls
PKCS5_pbe_set_ex. The case is such as PBE-SHA1-3DES.

PKCS12_pack_p7encdata_ex, crypto/pkcs12/p12_add.c:
```
...
    pbe_ciph = EVP_CIPHER_fetch(ctx, OBJ_nid2sn(pbe_nid), propq);

    if (pbe_ciph != NULL) {
        pbe = PKCS5_pbe2_set_iv_ex(pbe_ciph, iter, salt, saltlen, NULL, -1, ctx);
    } else {
        pbe = PKCS5_pbe_set_ex(pbe_nid, iter, salt, saltlen, ctx);
    }
...
```

So, we need to restore ERR_set_mark and ERR_pop_to_mark calls before and after
the EVP_CIPHER_fetch call for this case.

A reproducer is below.

```
$ openssl req -x509 -newkey rsa:2048 -keyout key.pem -out cert.pem -nodes \
  -subj "/CN=Test" 2> /dev/null
$ openssl pkcs12 \
    -export -in cert.pem -inkey key.pem -out test.p12 -passout pass: \
    -keypbe PBE-SHA1-3DES -certpbe PBE-SHA1-3DES
40276EC7677F0000:error:0308010C:digital envelope routines:inner_evp_generic_fetch:unsupported:crypto/evp/evp_fetch.c:376:Global default library context, Algorithm (PBE-SHA1-3DES : 0), Properties (<null>)
$ echo $?
0
```

80-test_pkcs12.t: Add test_pkcs12_passcerts_legacy_outerr2_empty test to test
this change.

Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
MergeDate: Wed Apr  8 10:09:07 2026
(Merged from https://github.com/openssl/openssl/pull/30607)

5 days agoquic_channel.c: avoid clipping in ack_delay_exponent/disable_active_migration setters
Eugene Syromiatnikov [Wed, 18 Mar 2026 09:13:26 +0000 (10:13 +0100)] 
quic_channel.c: avoid clipping in ack_delay_exponent/disable_active_migration setters

Avoid clipping of the provided values in setters due to type casting
by checking the values agains the type-specific maximum beforehand.

Fixes: 35dc6c353bfe "QUIC: Make more transport parameters configurable"
Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Wed Apr  8 10:05:27 2026
(Merged from https://github.com/openssl/openssl/pull/30485)

5 days agoquic_channel.c: avoid integer overflow in ossl_quic_channel_set_max_data_request
Eugene Syromiatnikov [Wed, 18 Mar 2026 09:03:08 +0000 (10:03 +0100)] 
quic_channel.c: avoid integer overflow in ossl_quic_channel_set_max_data_request

Check that DEFAULT_CONN_RXFC_MAX_WND_MUL * max_data multiplication
will not overflow uint64_t data type before performing it.

Fixes: 35dc6c353bfe "QUIC: Make more transport parameters configurable"
Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Wed Apr  8 10:05:26 2026
(Merged from https://github.com/openssl/openssl/pull/30485)

5 days agoquic_channel.c: check the setters return values
Eugene Syromiatnikov [Wed, 18 Mar 2026 08:59:31 +0000 (09:59 +0100)] 
quic_channel.c: check the setters return values

...and call them before updating QUIC_CHANNEL parameters.
Unchecked return value has been initially reported by Coverity
for ossl_quic_rxfc_init() call in ossl_quic_channel_set_max_data_request(),
but also seems to be relevant for ossl_quic_channel_set_max_streams_request()
and ossl_quic_channel_set_ack_delay_exponent_request().

Resolves: https://scan5.scan.coverity.com/#/project-view/65248/10222?selectedIssue=1689768
Fixes: 35dc6c353bfe "QUIC: Make more transport parameters configurable"
Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Wed Apr  8 10:05:25 2026
(Merged from https://github.com/openssl/openssl/pull/30485)

5 days agoDeprecate EVP_CIPHER_CTX_get_num() and EVP_CIPHER_CTX_set_num().
slontis [Tue, 10 Mar 2026 03:17:55 +0000 (14:17 +1100)] 
Deprecate EVP_CIPHER_CTX_get_num() and EVP_CIPHER_CTX_set_num().

Suggested to be added in OpenSSL 4.1.
Since engines have been removed, these are redundant functions.
End users should not generally be accessing this internal field.

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Frederik Wedel-Heinen <fwh.openssl@gmail.com>
Reviewed-by: Norbert Pocs <norbertp@openssl.org>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Wed Apr  8 10:02:58 2026
(Merged from https://github.com/openssl/openssl/pull/30335)

5 days agoNEWS.md: Update 3.6.0 release date
Eugene Syromiatnikov [Sun, 5 Apr 2026 11:28:27 +0000 (13:28 +0200)] 
NEWS.md: Update 3.6.0 release date

Original-Commit: 7b371d80d959 "Prepare for release of 3.6.0"

Reviewed-by: Paul Yang <paulyang.inf@gmail.com>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Wed Apr  8 10:00:08 2026
(Merged from https://github.com/openssl/openssl/pull/30686)

5 days agoCHANGES.md: move SSL_{add,set}1_{dnsname,ipaddr} entry to 4.0 section
Eugene Syromiatnikov [Sun, 5 Apr 2026 11:20:41 +0000 (13:20 +0200)] 
CHANGES.md: move SSL_{add,set}1_{dnsname,ipaddr} entry to 4.0 section

Also reword it to match the style of other entries.

Complements: cb1645e83bd9 "Add a changes entry"
Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Paul Yang <paulyang.inf@gmail.com>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Wed Apr  8 10:00:06 2026
(Merged from https://github.com/openssl/openssl/pull/30686)

5 days agoCHANGES.md: move SSL_CTX_is_server() entry to the 4.0 section
Eugene Syromiatnikov [Sun, 5 Apr 2026 11:18:25 +0000 (13:18 +0200)] 
CHANGES.md: move SSL_CTX_is_server() entry to the 4.0 section

Also reword it to match the style of other entries.

Complements: ca20e54e8674 "SSL_CTX_is_server() was added."
Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Paul Yang <paulyang.inf@gmail.com>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Wed Apr  8 10:00:05 2026
(Merged from https://github.com/openssl/openssl/pull/30686)

5 days agoMake ext argument of X509V3_EXT_print_fp const
Arne Schwabe [Wed, 25 Mar 2026 15:28:46 +0000 (16:28 +0100)] 
Make ext argument of X509V3_EXT_print_fp const

Commit e75bd84ffc7 made the ext argument of 509V3_EXT_print const
but did not give 509V3_EXT_print_fp which is essentially is a wrapper
around X509V3_EXT_print the same treatment.

This commit aligns the two functions again.

Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Wed Apr  8 09:15:11 2026
(Merged from https://github.com/openssl/openssl/pull/30572)

5 days agoFix documentation of SSL_ech_get1_status() return values
Tomas Mraz [Fri, 3 Apr 2026 14:18:52 +0000 (16:18 +0200)] 
Fix documentation of SSL_ech_get1_status() return values

Also do minor formatting cleanups on the man page.

Reviewed-by: Matt Caswell <matt@openssl.foundation>
Reviewed-by: Paul Yang <paulyang.inf@gmail.com>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
MergeDate: Wed Apr  8 09:13:38 2026
(Merged from https://github.com/openssl/openssl/pull/30673)

5 days agoECH: conformance test changes for echspec test tool
sftcd [Tue, 17 Mar 2026 21:10:34 +0000 (21:10 +0000)] 
ECH: conformance test changes for echspec test tool

Reviewed-by: Matt Caswell <matt@openssl.foundation>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Wed Apr  8 08:59:20 2026
(Merged from https://github.com/openssl/openssl/pull/30419)

5 days agoECH: Conformance test changes in response to AISLE review
sftcd [Tue, 17 Mar 2026 21:08:36 +0000 (21:08 +0000)] 
ECH: Conformance test changes in response to AISLE review

Reviewed-by: Matt Caswell <matt@openssl.foundation>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Wed Apr  8 08:59:19 2026
(Merged from https://github.com/openssl/openssl/pull/30419)

7 days ago80-test_cms.t: Accept success in malformed RSA decryption
Tomas Mraz [Mon, 6 Apr 2026 20:09:20 +0000 (22:09 +0200)] 
80-test_cms.t: Accept success in malformed RSA decryption

The decryption of the malformed encrypted message might succeed
with some probability. We accept that as the testcase tries to
trigger a crash which does not happen.

Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
MergeDate: Tue Apr  7 07:16:44 2026

7 days agorsa_kem: test RSA_public_encrypt() result in RSASVE
Nikola Pajkovsky [Thu, 19 Mar 2026 11:17:45 +0000 (12:17 +0100)] 
rsa_kem: test RSA_public_encrypt() result in RSASVE

RSA_public_encrypt() returns the number of bytes written on success and
-1 on failure.

Add regression coverage in evp_extra_test using custom low-level RSA
methods to exercise the provider/legacy boundary. The new tests verify
that encapsulation fails when RSA_public_encrypt() returns:

  * -1, which is the documented failure result, and
  * a short positive length, which is also invalid for RSASVE with
    RSA_NO_PADDING because the ciphertext must be exactly nlen bytes.

Signed-off-by: Nikola Pajkovsky <nikolap@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.foundation>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Mon Apr  6 19:45:39 2026

7 days agorsa_kem: validate RSA_public_encrypt() result in RSASVE
Nikola Pajkovsky [Thu, 19 Mar 2026 11:16:08 +0000 (12:16 +0100)] 
rsa_kem: validate RSA_public_encrypt() result in RSASVE

RSA_public_encrypt() returns the number of bytes written on success and
-1 on failure. With the existing `if (ret)` check, a provider-side RSA KEM
encapsulation can incorrectly succeed when the underlying RSA public
encrypt operation fails. In that case the code reports success, returns
lengths as if encapsulation completed normally, and leaves the freshly
generated secret available instead of discarding it.

Tighten the success condition so RSASVE only succeeds when
RSA_public_encrypt() returns a positive value equal to the modulus-sized
output expected for RSA_NO_PADDING. Any other return value is treated as
failure, and the generated secret is cleansed before returning.

Fixes CVE-2026-31790
Signed-off-by: Nikola Pajkovsky <nikolap@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.foundation>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Mon Apr  6 19:45:38 2026

7 days agoAvoid possible buffer overflow in buf2hex conversion
Igor Ustinov [Thu, 5 Mar 2026 14:47:34 +0000 (15:47 +0100)] 
Avoid possible buffer overflow in buf2hex conversion

Fixes CVE-2026-31789

Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Mon Apr  6 19:39:23 2026

7 days agoAdded test for CVE-2026-28388
Daniel Kubec [Tue, 17 Mar 2026 10:14:56 +0000 (11:14 +0100)] 
Added test for CVE-2026-28388

Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Mon Apr  6 19:27:17 2026

7 days agoFix NULL Dereference When Delta CRL Lacks CRL Number Extension
Daniel Kubec [Tue, 17 Mar 2026 10:11:22 +0000 (11:11 +0100)] 
Fix NULL Dereference When Delta CRL Lacks CRL Number Extension

Fixes CVE-2026-28388

Co-authored-by: Igor Morgenstern <igor.morgenstern@aisle.com>
Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Mon Apr  6 19:27:16 2026

7 days agoOut-of-bounds read in AES-CFB-128 on X86-64 with AVX-512 support
Daniel Kubec [Wed, 18 Mar 2026 10:27:52 +0000 (11:27 +0100)] 
Out-of-bounds read in AES-CFB-128 on X86-64 with AVX-512 support

The partial-block pre-processing code in ossl_aes_cfb128_vaes_enc and
ossl_aes_cfb128_vaes_dec unconditionally loads 16 bytes from the input buffer
using unmasked vmovdqu8 instructions, even when fewer bytes are valid.
This can read 1–15 bytes beyond the provided buffer. The post-processing code
in the same file correctly uses masked loads to avoid this issue.

Fixes CVE-2026-28386

Co-Authored-by: Stanislav Fort <stanislav.fort@aisle.com>
Co-Authored-by: Pavel Kohout <pavel.kohout@aisle.com>
Co-Authored-by: Alex Gaynor <gaynor@anthropic.com>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Mon Apr  6 19:16:26 2026

7 days agoAdd test for CMS decryption with RSA keys
Neil Horman [Sun, 29 Mar 2026 14:47:03 +0000 (10:47 -0400)] 
Add test for CMS decryption with RSA keys

Ensure we don't encounter a segfault when decrypting CMS messages with
malformed EnvelopedData when using RSA-OAEP.

Co-authored-by: Tomas Mraz <tomas@openssl.foundation>
Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.foundation>
MergeDate: Mon Apr  6 18:58:32 2026

7 days agoFix NULL deref in rsa_cms_decrypt
Neil Horman [Wed, 1 Apr 2026 08:56:44 +0000 (10:56 +0200)] 
Fix NULL deref in rsa_cms_decrypt

Very simmilar to CVE-2026-28389, ensure that if we are missing
parameters in RSA-OAEP SourceFunc in CMS KeyTransportRecipientInfo,
we don't segfault when decrypting.

Co-authored-by: Tomas Mraz <tomas@openssl.foundation>
Fixes CVE-2026-28390

Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.foundation>
MergeDate: Mon Apr  6 18:58:30 2026

7 days agoTest for DH/ECDH CMS KARI processing NULL pointer dereference
Neil Horman [Tue, 31 Mar 2026 18:38:03 +0000 (14:38 -0400)] 
Test for DH/ECDH CMS KARI processing NULL pointer dereference

Test to ensure that, if we attempt to decrypt a CMS message with a
missing parameter field of KeyEncryptionAlgorithmIdentifier
we fail, rather than segfault.

Co-authored-by: Tomas Mraz <tomas@openssl.foundation>
Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.foundation>
MergeDate: Mon Apr  6 18:58:29 2026

7 days agoFix NULL deref in [ec]dh_cms_set_shared_info
Neil Horman [Mon, 16 Mar 2026 17:49:07 +0000 (13:49 -0400)] 
Fix NULL deref in [ec]dh_cms_set_shared_info

Multiple independent reports indicated a SIGSEGV was possible in CMS
processing when a crafted CMS EnvelopedData message using A Key
Agreement Recipient Info field.  If the
KeyEncryptionAlgorithmIdentifier omits the optional parameter field, the
referenced functions above will attempt to dereference the
alg->parameter data prior to checking if the parameter field is NULL.

Confirmed to resolve the issues using the reproducers provided in the
security reports.

Co-authored-by: Tomas Mraz <tomas@openssl.foundation>
Fixes CVE-2026-28389

Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.foundation>
MergeDate: Mon Apr  6 18:58:28 2026

10 days ago.github/workflows/windows.yml: Fix typo breaking the Windows CI
Tomas Mraz [Fri, 3 Apr 2026 16:04:21 +0000 (18:04 +0200)] 
.github/workflows/windows.yml: Fix typo breaking the Windows CI

Reviewed-by: Frederik Wedel-Heinen <fwh.openssl@gmail.com>
Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
MergeDate: Sat Apr  4 06:28:16 2026
(Merged from https://github.com/openssl/openssl/pull/30674)

10 days agodoc: document PKCS12 password prompting for certificates
kovan [Mon, 2 Feb 2026 14:47:35 +0000 (15:47 +0100)] 
doc: document PKCS12 password prompting for certificates

Document that commands reading certificates from PKCS#12 files may
prompt for a password. The existing documentation only mentioned
password prompting for private keys.

Fixes #21292

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Fri Apr  3 15:52:28 2026
(Merged from https://github.com/openssl/openssl/pull/29918)

10 days agoevp_test.c: Check error stack for new errors and not stale ones
Tomas Mraz [Thu, 2 Apr 2026 09:08:56 +0000 (11:08 +0200)] 
evp_test.c: Check error stack for new errors and not stale ones

The error stack might have stale entries but
we are interested only in those coming from the
EVP call being tested.

Fixes #30454

Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
MergeDate: Fri Apr  3 15:49:52 2026
(Merged from https://github.com/openssl/openssl/pull/30669)

10 days agoFix a CHANGES.md entry added to the wrong section
Matt Caswell [Thu, 2 Apr 2026 08:01:00 +0000 (09:01 +0100)] 
Fix a CHANGES.md entry added to the wrong section

This fixes the CHANGES.md entry added via #30225 which erroneously added
the entry in the "Changes between 3.6 and 4.0" section instead of the
"Changes between 4.0 and 4.1" section

Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Fri Apr  3 15:48:20 2026
(Merged from https://github.com/openssl/openssl/pull/30668)

10 days agoquic: fix NULL deref in ossl_quic_new_from_listener()
Abhinav Agarwal [Thu, 2 Apr 2026 05:58:30 +0000 (22:58 -0700)] 
quic: fix NULL deref in ossl_quic_new_from_listener()

ossl_quic_port_create_outgoing() can return NULL under memory pressure.
The result was used immediately by ossl_quic_channel_set_msg_callback()
without a NULL check, causing a crash on the SSL_new_from_listener()
API path.

The correct pattern already exists in create_channel() (same file): check
the return value and raise a non-normal error before jumping to cleanup.
Apply the same pattern here.

Fixes: 0b15147a37c ("Implement SSL_new_from_listener()")
Signed-off-by: Abhinav Agarwal <abhinavagarwal1996@gmail.com>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Fri Apr  3 15:46:54 2026
(Merged from https://github.com/openssl/openssl/pull/30667)

10 days agoci: Fix CYGWIN build
Milan Broz [Wed, 1 Apr 2026 12:24:44 +0000 (14:24 +0200)] 
ci: Fix CYGWIN build

The build should run with -j4 option, but this option
was never propagated to run command (lost in Powershell).

Just set bash as shell here. This speedups CYGWIN CI build
significantly.

Signed-off-by: Milan Broz <gmazyland@gmail.com>
Reviewed-by: Dmitry Misharov <dmitry@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Norbert Pocs <norbertp@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Fri Apr  3 15:45:11 2026
(Merged from https://github.com/openssl/openssl/pull/30661)

10 days agoutil/platform_symbols/windows-symbols.txt: add __stdio_common_vsnprintf_s
Eugene Syromiatnikov [Tue, 31 Mar 2026 10:47:20 +0000 (12:47 +0200)] 
util/platform_symbols/windows-symbols.txt: add __stdio_common_vsnprintf_s

Apparently, it has not been caught after a29d157fdb6d "Replace homebrewed
implementation of *printf*() functions with libc" due to non-working symbol
checks.

Fixes: a29d157fdb6d "Replace homebrewed implementation of *printf*() functions with libc"
Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Fri Apr  3 15:42:24 2026
(Merged from https://github.com/openssl/openssl/pull/30635)

10 days agoUpdate Windows CI workflow to supply correct DLLs to checkplatformsyms.pl
Eugene Syromiatnikov [Tue, 31 Mar 2026 03:10:42 +0000 (05:10 +0200)] 
Update Windows CI workflow to supply correct DLLs to checkplatformsyms.pl

The check was broken in several ways, which was concealed by the fact
that checkplatformsyms.pl returned success in many cases before:
  * Hard-coded file name suffixes (-3-x64) meant that the check
    was not performed on OpenSSL 4.0+ and never for 32-bit builds.
  * dumpbin also wasn't in PATH in some configurations, which also led
    to skipped checks.
Fix that by supplying proper file names based on OpenSSL major version
and ABI, add missing VCVars calls and working dir setups.

Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Fri Apr  3 15:42:23 2026
(Merged from https://github.com/openssl/openssl/pull/30635)

10 days ago.github/workflows/windows_comp.yml: drop platform symbol usage check
Eugene Syromiatnikov [Tue, 31 Mar 2026 17:13:55 +0000 (19:13 +0200)] 
.github/workflows/windows_comp.yml: drop platform symbol usage check

It has never worked, as an attempt to make it work leads to this error:

    Symbol ZSTD_compressStream2 not in the allowed platform symbols list
    Symbol ZSTD_CStreamInSize not in the allowed platform symbols list
    Symbol ZSTD_initCStream not in the allowed platform symbols list
    Symbol ZSTD_freeCStream not in the allowed platform symbols list
    Symbol ZSTD_endStream not in the allowed platform symbols list
    Symbol ZSTD_freeDStream not in the allowed platform symbols list
    Symbol ZSTD_initDStream not in the allowed platform symbols list
    Symbol ZSTD_decompressStream not in the allowed platform symbols list
    Symbol ZSTD_getErrorName not in the allowed platform symbols list
    Symbol ZSTD_DStreamInSize not in the allowed platform symbols list
    Symbol ZSTD_decompress not in the allowed platform symbols list
    Symbol ZSTD_flushStream not in the allowed platform symbols list
    Symbol ZSTD_isError not in the allowed platform symbols list
    Symbol ZSTD_createCStream_advanced not in the allowed platform symbols list
    Symbol ZSTD_createDStream_advanced not in the allowed platform symbols list
    Symbol ZSTD_compress not in the allowed platform symbols list

Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Fri Apr  3 15:42:22 2026
(Merged from https://github.com/openssl/openssl/pull/30635)

10 days agoutil/checkplatformsyms.pl: do not hard-code "libcrypto-3-x64" library name
Eugene Syromiatnikov [Tue, 31 Mar 2026 10:19:37 +0000 (12:19 +0200)] 
util/checkplatformsyms.pl: do not hard-code "libcrypto-3-x64" library name

Ideally, it should probably passed to the script as a parameter,
but, in the meantime, follow the relaxed attitude of the Unix
counterpart and match against any version and all expected arch
suffixes.

Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Fri Apr  3 15:42:21 2026
(Merged from https://github.com/openssl/openssl/pull/30635)

10 days agoutil/checkplatformsyms.pl: update the Unix symbol filtering
Eugene Syromiatnikov [Tue, 31 Mar 2026 10:17:51 +0000 (12:17 +0200)] 
util/checkplatformsyms.pl: update the Unix symbol filtering

Replace the grep|grep|awk|sed|sort|uniq abomination with a simple
and elegant awk script.

Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Fri Apr  3 15:42:20 2026
(Merged from https://github.com/openssl/openssl/pull/30635)

10 days agoutil/checkplatformsyms.pl: do not exit after the first symbol
Eugene Syromiatnikov [Tue, 31 Mar 2026 04:00:59 +0000 (06:00 +0200)] 
util/checkplatformsyms.pl: do not exit after the first symbol

If there are several offending symbols, using the checker becomes quite
tedious.

Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Fri Apr  3 15:42:18 2026
(Merged from https://github.com/openssl/openssl/pull/30635)

10 days agoutil/checkplatformsyms.pl: handle command exit code
Eugene Syromiatnikov [Tue, 31 Mar 2026 03:44:30 +0000 (05:44 +0200)] 
util/checkplatformsyms.pl: handle command exit code

Error out if the executed command (dumpbin/objdump) hasn't been
successful.

Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Fri Apr  3 15:42:17 2026
(Merged from https://github.com/openssl/openssl/pull/30635)

10 days agoutil/checkplatformsyms.pl: syntax nit fix
Eugene Syromiatnikov [Tue, 31 Mar 2026 03:13:08 +0000 (05:13 +0200)] 
util/checkplatformsyms.pl: syntax nit fix

Address the following complaint:

    \2 better written as $2 at ../util/checkplatformsyms.pl line 39.

Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Fri Apr  3 15:42:16 2026
(Merged from https://github.com/openssl/openssl/pull/30635)

10 days agoutil/checkplatformsyms.pl: check that supplied files exist
Eugene Syromiatnikov [Tue, 31 Mar 2026 03:11:59 +0000 (05:11 +0200)] 
util/checkplatformsyms.pl: check that supplied files exist

Otherwise their absense is seemingly ignored, which leads to overlooked
symbol additions.

Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Fri Apr  3 15:42:15 2026
(Merged from https://github.com/openssl/openssl/pull/30635)

10 days agoDoc: "ML-DSA external mu" clarify security categories
slontis [Mon, 30 Mar 2026 23:31:36 +0000 (10:31 +1100)] 
Doc: "ML-DSA external mu" clarify security categories

Clarify which digest algorithms correspond to the 3
security categories for ML-DSA key types.

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Fri Apr  3 15:40:25 2026
(Merged from https://github.com/openssl/openssl/pull/30632)

10 days agocrypto/err/err_all.c: load SM2 error strings
Eugene Syromiatnikov [Mon, 30 Mar 2026 09:23:31 +0000 (11:23 +0200)] 
crypto/err/err_all.c: load SM2 error strings

The function ossl_err_load_SM2_strings() exists, but wasn't called
in ossl_err_load_crypto_strings().  Rescind this omission.

Fixes: 3d328a445c2a "Add SM2 signature and ECIES schemes"
Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Fri Apr  3 15:32:47 2026
(Merged from https://github.com/openssl/openssl/pull/30625)

10 days agoevp_decodeblock_int(): Bugfix of padding check
Igor Ustinov [Sat, 28 Mar 2026 12:49:00 +0000 (13:49 +0100)] 
evp_decodeblock_int(): Bugfix of padding check

The padding check didn't take into account that by this point the f pointer
had already shifted by 4 positions. Luckily, the original f[2] and f[3]
were saved in c and d .

This code is not reachable in normal operation, but that is not a reason
not to fix it.

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Fri Apr  3 15:31:13 2026
(Merged from https://github.com/openssl/openssl/pull/30618)

10 days agoEVP_MD_CTX_gettable_params(): Add NULL check before dereference
Drokovar Dmitriy [Tue, 10 Mar 2026 05:38:57 +0000 (01:38 -0400)] 
EVP_MD_CTX_gettable_params(): Add NULL check before dereference

Found by Linux Verification Center (linuxtesting.org) with SVACE.

CLA:trivial

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
MergeDate: Fri Apr  3 15:24:39 2026
(Merged from https://github.com/openssl/openssl/pull/30589)

10 days agoAdd INT_MAX bounds check to d2i_ASN1_UINTEGER before (int)len cast
Koda Reef [Sun, 22 Mar 2026 21:44:21 +0000 (21:44 +0000)] 
Add INT_MAX bounds check to d2i_ASN1_UINTEGER before (int)len cast

d2i_ASN1_UINTEGER uses (int)len for OPENSSL_malloc, memcpy, and
ASN1_STRING_set0 where len is a long. On LP64 platforms (long is
64-bit, int is 32-bit), values exceeding INT_MAX are silently
truncated, causing undersized allocation and heap buffer overflow.

The sibling function ossl_c2i_ASN1_BIT_STRING in a_bitstr.c already
has this guard (line 92: if (len > INT_MAX)). This adds the same
check to d2i_ASN1_UINTEGER for consistency.

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Frederik Wedel-Heinen <fwh.openssl@gmail.com>
MergeDate: Fri Apr  3 15:22:30 2026
(Merged from https://github.com/openssl/openssl/pull/30532)

10 days agoUpdated broken documentation links in various files
Stacey Zheng [Thu, 19 Mar 2026 22:59:38 +0000 (18:59 -0400)] 
Updated broken documentation links in various files

Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
MergeDate: Fri Apr  3 15:18:46 2026
(Merged from https://github.com/openssl/openssl/pull/30516)

10 days agoUpdate manuals and demos to consider OSSL_PARAM_clear_free() vs OSSL_PARAM_free()
Emmalee Carpenter [Thu, 19 Mar 2026 20:04:49 +0000 (16:04 -0400)] 
Update manuals and demos to consider OSSL_PARAM_clear_free() vs OSSL_PARAM_free()

Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
MergeDate: Fri Apr  3 15:14:25 2026
(Merged from https://github.com/openssl/openssl/pull/30506)

10 days agoAdd a test for an early DTLS CCS with extra data on the last record
Matt Caswell [Thu, 19 Mar 2026 11:44:48 +0000 (11:44 +0000)] 
Add a test for an early DTLS CCS with extra data on the last record

We move the DTLS CCS early, and then add extra trailing data on the
last record before the epoch change. We expect to see an unexpected
message error.

Reviewed-by: Frederik Wedel-Heinen <fwh.openssl@gmail.com>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Fri Apr  3 15:06:52 2026
(Merged from https://github.com/openssl/openssl/pull/30503)

10 days agoFix a Use-After-Free bug in the DTLS code
Matt Caswell [Thu, 19 Mar 2026 10:38:22 +0000 (10:38 +0000)] 
Fix a Use-After-Free bug in the DTLS code

The newly added #30225 introduced a UAF bug in the master branch found
by the dtlsserver fuzzer. If a CCS arrives early and there is trailing
data left in the current record at the point that we change epoch then
the buffer holding the trailing data is freed as part of setting up the
new record layer, but we still have dangling references into that buffer
causing the UAF.

Fixes #30487

Reviewed-by: Frederik Wedel-Heinen <fwh.openssl@gmail.com>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Fri Apr  3 15:06:50 2026
(Merged from https://github.com/openssl/openssl/pull/30503)

10 days agocrypto/x509/pcy_tree.c: fix leak of tree in X509_policy_check()
huanghuihui0904 [Mon, 16 Mar 2026 03:05:36 +0000 (11:05 +0800)] 
crypto/x509/pcy_tree.c: fix leak of tree in X509_policy_check()

When init_ret indicates both X509_PCY_TREE_EXPLICIT and X509_PCY_TREE_EMPTY,
the function returns without freeing the initialized policy tree.
Free the tree before returning, consistent with the earlier TREE_EMPTY branch.

Also defer *ptree = tree assignment and free the tree when user policies
are empty to avoid returning invalid memory.

Fixes #30435

Signed-off-by: huanghuihui0904 <625173@qq.com>
Reviewed-by: Frederik Wedel-Heinen <fwh.openssl@gmail.com>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
MergeDate: Fri Apr  3 15:03:37 2026
(Merged from https://github.com/openssl/openssl/pull/30436)

10 days agodoc: clarify X509_STORE thread safety and lifetime contract
Herman Malik [Wed, 11 Mar 2026 21:49:18 +0000 (14:49 -0700)] 
doc: clarify X509_STORE thread safety and lifetime contract

Improve the description of X509_STORE_lock() in X509_STORE_new.pod to
emphasize it acquires an exclusive write lock.

Add a NOTES section to X509_STORE_new.pod covering which operations are
internally thread-safe and which are not, as well as documentation on
lifetime management and reference counting.

Add a NOTES section to X509_STORE_CTX_get_by_subject.pod explaining
that the store's internal lock is released before the found object's
reference count is incremented, so the caller must ensure the store
outlives the lookup.

Clarify the reference counting and the caller's responsibilities.
Remove internal details for conciseness.

Related to #30310

Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
MergeDate: Fri Apr  3 15:00:55 2026
(Merged from https://github.com/openssl/openssl/pull/30382)

10 days agoFix integer overflow in EVP_ENCODE_LENGTH and base64 encoding paths
eclipse07077 [Mon, 9 Mar 2026 12:35:43 +0000 (21:35 +0900)] 
Fix integer overflow in EVP_ENCODE_LENGTH and base64 encoding paths

The EVP_ENCODE_LENGTH macro performs all arithmetic in the type of
its argument. When the argument is int and exceeds approximately
1.6 billion, intermediate results overflow signed int, potentially
wrapping to a smaller positive value rather than a negative one.

In b64_write() (crypto/evp/bio_b64.c), this causes OPENSSL_malloc
to allocate a buffer smaller than the actual encoded output size.
EVP_EncodeUpdate then writes past the end of the undersized buffer.

Changes:
- Cast macro argument to size_t in EVP_ENCODE_LENGTH to prevent
  signed integer overflow
- Change encoded_length in b64_write() from int to size_t and add
  an explicit overflow sanity check before allocation
- Change return type of evp_encodeblock_int() and
  encode_base64_avx2() from int to size_t so that large encoded
  output lengths are not truncated
- Update EVP_EncodeUpdate() to use size_t for the encoder return
  value accumulator (j), consistent with the existing size_t total
- Add explicit (int) casts in EVP_EncodeBlock() and EVP_EncodeFinal()
  where the public API requires int return values

Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Fri Apr  3 14:55:29 2026
(Merged from https://github.com/openssl/openssl/pull/30321)

11 days agoRevert "Make cpuid_setup non-constructor"
Bob Beck [Tue, 24 Mar 2026 18:26:37 +0000 (12:26 -0600)] 
Revert "Make cpuid_setup non-constructor"

This reverts commit 1d770fc6a9a0a7d6e20f3232180b80c366c2d4df.

Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
MergeDate: Thu Apr  2 07:18:05 2026
(Merged from https://github.com/openssl/openssl/pull/30557)

11 days agoMake riscv cpucap not use BIO_snprintf
Bob Beck [Tue, 24 Mar 2026 18:24:14 +0000 (12:24 -0600)] 
Make riscv cpucap not use BIO_snprintf

Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
MergeDate: Thu Apr  2 07:18:03 2026
(Merged from https://github.com/openssl/openssl/pull/30557)

11 days agoAdd test for NULL uri handling in OSSL_STORE_delete()
Weidong Wang [Tue, 24 Mar 2026 17:10:28 +0000 (12:10 -0500)] 
Add test for NULL uri handling in OSSL_STORE_delete()

Verify that passing NULL as the uri parameter to OSSL_STORE_delete()
returns 0 rather than crashing with a NULL pointer dereference.

Reviewed-by: Frederik Wedel-Heinen <fwh.openssl@gmail.com>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
MergeDate: Thu Apr  2 07:14:09 2026
(Merged from https://github.com/openssl/openssl/pull/30512)

11 days agoFix NULL pointer dereference in OSSL_STORE_delete()
Weidong Wang [Fri, 20 Mar 2026 12:00:10 +0000 (07:00 -0500)] 
Fix NULL pointer dereference in OSSL_STORE_delete()

Add a NULL check for the uri parameter before passing it to
OPENSSL_strlcpy(), matching the guard already present in
OSSL_STORE_open_ex().

Fixes: 0a8807b4a838 "Store: API for deletion"
Reviewed-by: Frederik Wedel-Heinen <fwh.openssl@gmail.com>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
MergeDate: Thu Apr  2 07:14:08 2026
(Merged from https://github.com/openssl/openssl/pull/30512)

12 days agoFix names of X509_V_ERR_ERROR_IN_CERT_* constants in man page
Arne Schwabe [Tue, 31 Mar 2026 11:30:38 +0000 (13:30 +0200)] 
Fix names of X509_V_ERR_ERROR_IN_CERT_* constants in man page

The names of the X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD and
X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD in the man page have
the first _ERR_ spelt out as _ERROR_ instead.

Signed-off-by: Arne Schwabe <arne@rfc2549.org>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Frederik Wedel-Heinen <fwh.openssl@gmail.com>
MergeDate: Wed Apr  1 17:06:53 2026
(Merged from https://github.com/openssl/openssl/pull/30643)

(cherry picked from commit e39a6de5c8ba43f95073cd3f88cdb86bd131825e)

12 days agoapps/lib/apps.c: use fstat on an opened fd in app_mmap_file()
Eugene Syromiatnikov [Mon, 30 Mar 2026 08:52:07 +0000 (10:52 +0200)] 
apps/lib/apps.c: use fstat on an opened fd in app_mmap_file()

Coverity has rightfully complained that using stat() before opening file
leads to TOCTOU issues, refactor the code to open the file first and
then perform stat checks on the opened file descriptor.  It is still far
from foolproof, as the file is not locked, and stat() is used elsewhere,
but at least it seems to be a step in the right direction.

Resolves: https://scan5.scan.coverity.com/#/project-view/65248/10222?selectedIssue=1690686
Fixes: 80b7e49c273f "Use mmap for pkeyutl -rawin and dgst one-shot input"
Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
MergeDate: Wed Apr  1 12:46:08 2026
(Merged from https://github.com/openssl/openssl/pull/30624)

13 days agoFix loongarch64 build and clean up include paths
openssl-machine [Mon, 23 Mar 2026 10:24:34 +0000 (11:24 +0100)] 
Fix loongarch64 build and clean up include paths

Fixes #30418

Add ../crypto to INCLUDE[p_ossltest].
Remove useless .. from various INCLUDE[] - this was necessary when e_os.h was
placed in the SRCDIR root.

Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Norbert Pocs <norbertp@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
MergeDate: Tue Mar 31 15:51:53 2026
(Merged from https://github.com/openssl/openssl/pull/30536)

13 days agoutil/platform_symbols/windows-symbols.txt: add _get_osfhandle
Eugene Syromiatnikov [Tue, 31 Mar 2026 02:46:29 +0000 (04:46 +0200)] 
util/platform_symbols/windows-symbols.txt: add _get_osfhandle

Its usage is introduced in commit b238d36c50a1 "Fix certificate read
from stdin on Windows".

Fixes: b238d36c50a1 "Fix certificate read from stdin on Windows"
Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Norbert Pocs <norbertp@openssl.org>
MergeDate: Tue Mar 31 11:55:26 2026
(Merged from https://github.com/openssl/openssl/pull/30634)

13 days agoutil/platform_symbols/windows-symbols.txt: sort in lexicographical order
Eugene Syromiatnikov [Tue, 31 Mar 2026 02:45:27 +0000 (04:45 +0200)] 
util/platform_symbols/windows-symbols.txt: sort in lexicographical order

Sort using "LC_ALL=C sort -u".

Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Norbert Pocs <norbertp@openssl.org>
MergeDate: Tue Mar 31 11:55:25 2026
(Merged from https://github.com/openssl/openssl/pull/30634)

13 days agoDon't eat a NULL if a queryfile is not provided
Bob Beck [Fri, 27 Mar 2026 21:34:16 +0000 (15:34 -0600)] 
Don't eat a NULL if a queryfile is not provided

Fixes: 18cd23df8a8f2 "Remove "noise" comments from TS files."
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
MergeDate: Tue Mar 31 09:51:38 2026
(Merged from https://github.com/openssl/openssl/pull/30608)

13 days agoRefactor ML-KEM decap, also cleanse failure_key
Viktor Dukhovni [Thu, 26 Mar 2026 17:02:34 +0000 (04:02 +1100)] 
Refactor ML-KEM decap, also cleanse failure_key

Pedantically cleanse the typically unused decap failure_key's stack
copy.

When actually used, it is copied into the caller's shared secret result,
perhaps to be cleansed there after use, or not, that's the callers
business.

While at it, slightly refactor the internal decap() implementation to
consolidate all the data to be cleansed into a single buffer, but now
avoid copying the public key hash, instead, when computing "K || r" as
"G(m || h)" include "h" via a separate EVP_DigestUpdate() call.

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Tue Mar 31 05:19:40 2026
(Merged from https://github.com/openssl/openssl/pull/30598)

13 days agoFix -Wdiscarded-qualifiers warnings shown when glibc-2.43 is used
Collin Funk [Sat, 28 Mar 2026 07:41:01 +0000 (00:41 -0700)] 
Fix -Wdiscarded-qualifiers warnings shown when glibc-2.43 is used

When building with glibc-2.43 there is the following warning:

    crypto/x509/x509_vpm.c: In function 'validate_email_name':
    crypto/x509/x509_vpm.c:317:13: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
      317 |     if ((at = memchr(name, '@', len)) == NULL)
          |             ^

This is due to a change described in the NEWS file of glibc-2.43:

    * For ISO C23, the functions bsearch, memchr, strchr, strpbrk, strrchr,
      strstr, wcschr, wcspbrk, wcsrchr, wcsstr and wmemchr that return
      pointers into their input arrays now have definitions as macros that
      return a pointer to a const-qualified type when the input argument is
      a pointer to a const-qualified type.

Systems using this recent glibc version will likely also be using GCC 15
or later which default to `-std=gnu23`, meaning that this warning will
show up without modifying `CFLAGS`.

We can make these pointers const since we never write to them.

Complements: f584ae959cbc "Let's support multiple names for certificate verification"

Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
MergeDate: Tue Mar 31 02:38:14 2026
(Merged from https://github.com/openssl/openssl/pull/30613)

13 days agoAdd negative length validation in EVP_EncryptUpdate and EVP_DecryptUpdate
Pranavjeet-Naidu [Tue, 24 Mar 2026 23:45:30 +0000 (05:15 +0530)] 
Add negative length validation in EVP_EncryptUpdate and EVP_DecryptUpdate

Added input length validation checks to prevent potential security issues
when negative values are passed to EVP_EncryptUpdate and EVP_DecryptUpdate.
These functions cast inl (int) to size_t without validation, which could lead
to unexpectedly large buffer allocation attempts or unintended behavior with
negative inputs.

Validation is performed early in both functions to ensure only valid,
non-negative lengths are processed. Error is reported via EVP_R_INVALID_LENGTH.

Fixes: https://github.com/openssl/openssl/issues/30486
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
MergeDate: Tue Mar 31 02:10:52 2026
(Merged from https://github.com/openssl/openssl/pull/30560)

13 days agoConfigurations/10-main.conf: minimum NASM version needs to be 2.09 on Windows
Tomas Mraz [Wed, 25 Mar 2026 17:54:18 +0000 (18:54 +0100)] 
Configurations/10-main.conf: minimum NASM version needs to be 2.09 on Windows

Otherwise some assembler code might be miscompiled.

Fixes: https://github.com/openssl/openssl/issues/20529
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
MergeDate: Tue Mar 31 01:47:41 2026
(Merged from https://github.com/openssl/openssl/pull/30576)

13 days agoFix certificate read from stdin on Windows
Milan Broz [Tue, 24 Mar 2026 13:50:21 +0000 (14:50 +0100)] 
Fix certificate read from stdin on Windows

On Windows, reading certificate from stdin could fail like

    > type cert.der| openssl.exe x509 -inform DER -outform PEM
    Could not find or decode certificate from <stdin>

The decoder already tries to insert BIO_f_readbuffer
in this case, unfortunately it depends on undefined behavior
of ftell() on Windows.

Fix it by adding check for non-seekable input case
to BIO file control.

Note, the added testcase tests binary input certificate,
but does not trigger this issue explicitly.

Fixes: https://github.com/openssl/openssl/issues/19508
Signed-off-by: Milan Broz <gmazyland@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
MergeDate: Tue Mar 31 01:38:21 2026
(Merged from https://github.com/openssl/openssl/pull/30559)

13 days agoRemove superfluous volatile for RCU on Windows
Milan Broz [Fri, 27 Mar 2026 09:38:52 +0000 (10:38 +0100)] 
Remove superfluous volatile for RCU on Windows

When compiling on the MINGW platform, there are many warnings like this:

  warning: passing argument 1 of 'CRYPTO_atomic_add64' discards 'volatile'
  qualifier from pointer target type [-Wdiscarded-qualifiers]
  CRYPTO_atomic_add64(&lock->qp_group[qp_idx].users, (uint64_t)1, &tmp64,
                      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The warning actually shows several issues with volatile in struct rcu_qp:

 - all handling functions using it do not use the volatile modifier,
   so that the compiler can treat this pointer as non-volatile already
   (Posix pthread variant does not use volatile here at all.)

 - thread safety is already guaranteed by using locks
   (NO_INTERLOCKEDOR64) or Interlocked*64 Win32 API functions.

 - the volatile removal modifier should always be explicit

In short, I think the volatile in struct rcu_qp on Windows
has no additional value and can be removed.

This also fixes the warnings mentioned above :-)

Signed-off-by: Milan Broz <gmazyland@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
MergeDate: Tue Mar 31 01:25:56 2026
(Merged from https://github.com/openssl/openssl/pull/30602)