Skip to content

caddytls: Send ECH retry configs when rejecting ECH - #8142

Merged
steadytao merged 2 commits into
caddyserver:masterfrom
videah:ech-retry-configs
Oct 5, 2026
Merged

steadytao merged 2 commits into
caddyserver:masterfrom
videah:ech-retry-configs

Conversation

@videah

@videah videah commented Oct 4, 2026

Copy link
Copy Markdown
Contributor

Closes #8141

Sets the GetEncryptedClientHelloKeys callback on each connection policy's TLS config as well as the outer one so that crypto/tls includes retry_configs when it rejects ECH.

Assistance Disclosure

Claude Opus 5.5 identified the underlying problem after initial analysis by hand, was then used to write up a fix along with an integration test

@CLAassistant

CLAassistant commented Oct 4, 2026 •

Copy link
Copy Markdown

CLA assistant check
All committers have signed the CLA.

@steadytao
steadytao merged commit 700d603 into caddyserver:master Oct 5, 2026
27 checks passed
@steadytao

Copy link
Copy Markdown
Member

Thank you!

This was referenced Nov 3, 2026
NickCao pushed a commit to NickCao/caddy that referenced this pull request Nov 4, 2026
* caddytls: Send ECH retry configs when rejecting ECH
* chore: add licence header to ECH test

(cherry picked from commit 700d603)
@francislavoie francislavoie added this to the v2.11.8 milestone Nov 4, 2026
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.

ECH: retry_configs are never sent when ECH is rejected

4 participants