don't offer 0-RTT after a HelloRetryRequest

quic-go · Mar 18, 2023 · 3d7ffb3 · 3d7ffb3
1 parent 7673484
commit 3d7ffb3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/handshake_client_tls13.go b/handshake_client_tls13.go
@@ -279,6 +279,7 @@ func (hs *clientHandshakeStateTLS13) processHelloRetryRequest() error {
 		}
 	}
 
+	hs.hello.earlyData = false // disable 0-RTT
 	if _, err := hs.c.writeHandshakeRecord(hs.hello, hs.transcript); err != nil {
 		return err
 	}

diff --git a/handshake_server_tls13.go b/handshake_server_tls13.go
@@ -486,6 +486,11 @@ func (hs *serverHandshakeStateTLS13) doHelloRetryRequest(selectedGroup CurveID)
 		return errors.New("tls: client illegally modified second ClientHello")
 	}
 
+	if clientHello.earlyData {
+		c.sendAlert(alertIllegalParameter)
+		return errors.New("tls: client offered 0-RTT data in second ClientHello")
+	}
+
 	hs.clientHello = clientHello
 	return nil
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     		}
     	}
+    	hs.hello.earlyData = false // disable 0-RTT
     	if _, err := hs.c.writeHandshakeRecord(hs.hello, hs.transcript); err != nil {
     		return err
     	}
@@ Expand Down @@