Navigation Menu

Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

only call the Rejected0RTT() callback on HRR when 0-RTT was tried #3070

Merged
merged 1 commit into from Mar 9, 2021

Conversation

marten-seemann
Copy link
Member

This is the relevant diff. For some reason, the diff doesn't work on GitHub this time.

diff --git a/handshake_client_tls13.go b/handshake_client_tls13.go
index 9cade7e..d9f7ba4 100644
--- a/handshake_client_tls13.go
+++ b/handshake_client_tls13.go
@@ -262,10 +262,10 @@ func (hs *clientHandshakeStateTLS13) processHelloRetryRequest() error {
                }
        }

-       if hs.hello.earlyData && c.extraConfig != nil && c.extraConfig.Rejected0RTT != nil {
+       hs.hello.earlyData = false // disable 0-RTT
+       if c.extraConfig != nil && c.extraConfig.Rejected0RTT != nil {
                c.extraConfig.Rejected0RTT()
        }
-       hs.hello.earlyData = false // disable 0-RTT

        hs.transcript.Write(hs.hello.marshal())
        if _, err := c.writeRecord(recordTypeHandshake, hs.hello.marshal()); err != nil {

@codecov
Copy link

codecov bot commented Mar 5, 2021

Codecov Report

Merging #3070 (33037be) into master (f58b456) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #3070   +/-   ##
=======================================
  Coverage   86.05%   86.05%           
=======================================
  Files         133      133           
  Lines        9443     9443           
=======================================
  Hits         8126     8126           
  Misses        955      955           
  Partials      362      362           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f58b456...33037be. Read the comment docs.

@marten-seemann marten-seemann merged commit 13ad4ce into master Mar 9, 2021
@marten-seemann marten-seemann deleted the fix-0rtt-rejected-on-hrr branch March 9, 2021 08:09
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.

None yet

2 participants