don't offer 0-RTT after a HelloRetryRequest

quic-go · May 29, 2023 · 5ad0b8b · 5ad0b8b
1 parent 3be08c2
commit 5ad0b8b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/handshake_client_tls13.go b/handshake_client_tls13.go
@@ -282,6 +282,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
 	}
@@ -750,7 +751,7 @@ func (c *Conn) handleNewSessionTicket(msg *newSessionTicketMsgTLS13) error {
 
 	cacheKey := c.clientSessionCacheKey()
 	if cacheKey != "" {
-	c.config.ClientSessionCache.Put(cacheKey, toClientSessionState(session))
+		c.config.ClientSessionCache.Put(cacheKey, toClientSessionState(session))
 	}
 
 	return nil

diff --git a/handshake_server_tls13.go b/handshake_server_tls13.go
@@ -495,6 +495,11 @@ func (hs *serverHandshakeStateTLS13) doHelloRetryRequest(selectedGroup CurveID)
 		return errors.New("tls: client illegally modified second ClientHello")
 	}
 
+	if illegalClientHelloChange(clientHello, hs.clientHello) {
+		c.sendAlert(alertIllegalParameter)
+		return errors.New("tls: client illegally modified second ClientHello")
+	}
+
 	hs.clientHello = clientHello
 	return nil
 }