Skip to content

Merge in upstream v5.4.0 - #53

Merged
jrose-signal merged 21 commits into
mainfrom
jrose/v5.4.0
Nov 12, 2026
Merged

jrose-signal merged 21 commits into
mainfrom
jrose/v5.4.0

Conversation

@jrose-signal

Copy link
Copy Markdown

No description provided.

dotjs and others added 21 commits October 14, 2026 16:45
Includes upstream commits dd682072b ("Block a handful of intermediate
certificates") and e52f12bcd ("crypto/x509 MTC: Update to draft -07").

ML-DSA was previously already enabled by default for TLS 1.3 servers.
Now boring-pq.patch also enables ML-DSA for TLS 1.3 clients by default
and in the fips202205 and fips202609 profiles.

The PQ kex patch rebase conflicted due to e52f12bcd ("crypto/x509 MTC:
Update to draft -07") changing and renumbering OIDs. To reduce future
conflicts, I now picked NID 959 which was previously used by CECPQ2.
A trivial conflict in the `SSL_CTX_use_second_keyshare` addition was
resolved as some definitions moved to a private openssl/ssl_deprecated.h
header since 5509db769 ("ssl: Move deprecated APIs out").

Update the outdated boring crate docs, we don't support the old FIPS
140-2 validated module.
A build started from a git hook inherits GIT_DIR and related variables,
so the build script's git init and git apply ran against the caller's
repository instead of the copied BoringSSL sources. From a worktree this
writes core.bare = true into the main checkout's config.

Fixes cloudflare#527
`SslRef::set_certificate_der_unchecked` and
`SslContextBuilder::set_certificate_der_unchecked` allow callers to
preserve certificate DER that cannot be represented by a parsed
`X509Ref`.

The impl of `AsRef<Asn1StringRef>` for `Asn1TimeRef` lets callers
inspect encoded time bytes without direct FFI. Documentation notes
that the unchecked setters bypass full X.509 parsing, and tests cover
both setters.
@jrose-signal
jrose-signal marked this pull request as ready for review November 12, 2026 00:57
@jrose-signal
jrose-signal merged commit cf8e809 into main Nov 12, 2026
27 checks passed
@jrose-signal
jrose-signal deleted the jrose/v5.4.0 branch November 12, 2026 01:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants