Skip to content

Merge upstream rustls v0.23.45 into watfaq-rustls - #12

Closed
ibigbug wants to merge 72 commits into
watfaq/0.23.40from
merge-0.23.45
Closed

ibigbug wants to merge 72 commits into
watfaq/0.23.40from
merge-0.23.45

Conversation

@ibigbug

@ibigbug ibigbug commented Oct 1, 2026

Copy link
Copy Markdown
Member

Summary

Merges upstream rustls v0.23.45 into watfaq-rustls, preserving all Reality and session_id_generator custom patches.

Key Changes

  • Merged upstream v0.23.45 tag
  • Preserved VLESS Reality (src/client/reality.rs)
  • Preserved session_id_generator hook (new_with_session_id_generator)
  • Adapted supports_version call in hs.rs for 0.23.45 Protocol parameter
  • Verified with reality test suite passed (12 passed)

djc and others added 30 commits June 22, 2026 13:16
This test was only fetching ECH config data from DNS and then checking
we could unmarshal it. The daily tests CI is now configured to use the
full-fledged ech-example.rs binary for the same test sites. Doing that
_also_ tests the DNS ECH config list handling, but goes further and uses
the unmarshalled configs for a real ECH enabled handshake. We can delete
these tests on the back of that improved end-to-end coverage.
The libcrux crates have fixed this upstream but a release may not be
available for some time. Ignore the unmaintained transitive dep warning
for now.
Add a `max_tls13_tickets` field to `ServerConfig` that caps the number
of tickets the server will send in response to a client ticket_request
extension. Defaults to 0 (disabled), preserving current behavior.

This is the backwards-compatible equivalent of the `Tls13Tickets`
struct on `main`.
Allow a TLS 1.3 client to request a specific number of session tickets
via the ticket_request extension, and let the server honor that request
up to its configured max_tls13_tickets.

The client sends new_session_count/resumption_count in its ClientHello
(configured via ClientConfig::send_ticket_request); the server replies
with the expected count in EncryptedExtensions and sends
min(requested, max_tls13_tickets) NewSessionTicket messages.

Backport of the feature from main, adapted for the rel-0.23 API surface.
Test/example code only; fixed on main by dropping the dependency.
On Unix, open the key log with mode 0o600 so a typical umask does not
leave traffic secrets world-readable. Existing files are left unchanged.
ctz and others added 28 commits September 7, 2026 09:03
This checks RSA-KEM-style ciphersuites are not considered
usable with RSA-PSS certificate keys.  But we don't support
RSA-KEM suites.
We unconditionally ack SNI and so don't have a way
of controlling this.
Previously, this only matched the tail of the chain.
This is partial, because at the moment rustls only supports remembering a
singular KX group preference for a given server, rather than a priority
list that is specified by `draft-ietf-tls-key-share-prediction-03`.

But this is enough to pass these tests, by taking the highest priority item
from the list.
MLKEM is FIPS-pending, so the hybrid is allowed.
On main this is covered by 9e56091 ("Send fatal alerts solely from
error paths"), which derives an alert from every error. That refactor
is too large to backport, so send the alert explicitly at this site.

Fixes the Client-VerifyDefault-ML-DSA-*-TLS12 bogo tests, which expect
the connection to close with an alert rather than a bare EOF.
TLS 1.2 relies on `SignatureAlgorithm` values while 1.3 relies on
`SignatureScheme` values. Some newer signature schemes (like ML-DSA)
are only supported for 1.3 -- make sure these are never selected.
This has been integrated into the main crate.
Incorporate test case from GHSA-2mjx-qc3c-rqvc POC, plus three more
limited tests.
# Conflicts:
#	rustls/src/client/builder.rs
#	rustls/src/client/client_conn.rs
#	rustls/src/client/hs.rs
@ibigbug ibigbug closed this Oct 1, 2026
@ibigbug
ibigbug deleted the merge-0.23.45 branch October 1, 2026 09:46
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.

9 participants