remove TLS post-handshake message reassembly logic (#4073)

Go 1.21.1 was released, which fixed the bug that made this workaround
necessary.

connection.go

@@ -243,7 +243,7 @@ var newConnection = func(
 		handshakeDestConnID: destConnID,
 		srcConnIDLen:        srcConnID.Len(),
 		tokenGenerator:      tokenGenerator,
-		oneRTTStream:        newCryptoStream(true),
+		oneRTTStream:        newCryptoStream(),
 		perspective:         protocol.PerspectiveServer,
 		tracer:              tracer,
 		logger:              logger,
@@ -391,7 +391,7 @@ var newClientConnection = func(
 		s.logger,
 	)
 	s.mtuDiscoverer = newMTUDiscoverer(s.rttStats, getMaxPacketSize(s.conn.RemoteAddr()), s.sentPacketHandler.SetMaxDatagramSize)
-	oneRTTStream := newCryptoStream(true)
+	oneRTTStream := newCryptoStream()
 	params := &wire.TransportParameters{
 		InitialMaxStreamDataBidiRemote: protocol.ByteCount(s.config.InitialStreamReceiveWindow),
 		InitialMaxStreamDataBidiLocal:  protocol.ByteCount(s.config.InitialStreamReceiveWindow),
@@ -447,8 +447,8 @@ var newClientConnection = func(
 }
 
 func (s *connection) preSetup() {
-	s.initialStream = newCryptoStream(false)
+	s.initialStream = newCryptoStream()
-	s.handshakeStream = newCryptoStream(false)
+	s.handshakeStream = newCryptoStream()
 	s.sendQueue = newSendQueue(s.conn)
 	s.retransmissionQueue = newRetransmissionQueue()
 	s.frameParser = wire.NewFrameParser(s.config.EnableDatagrams)

crypto_stream.go

@@ -30,17 +30,10 @@ type cryptoStreamImpl struct {
 
 	writeOffset protocol.ByteCount
 	writeBuf    []byte
-
-	// Reassemble TLS handshake messages before returning them from GetCryptoData.
-	// This is only needed because crypto/tls doesn't correctly handle post-handshake messages.
-	onlyCompleteMsg bool
 }
 
-func newCryptoStream(onlyCompleteMsg bool) cryptoStream {
+func newCryptoStream() cryptoStream {
-	return &cryptoStreamImpl{
+	return &cryptoStreamImpl{queue: newFrameSorter()}
-		queue:           newFrameSorter(),
-		onlyCompleteMsg: onlyCompleteMsg,
-	}
 }
 
 func (s *cryptoStreamImpl) HandleCryptoFrame(f *wire.CryptoFrame) error {
@@ -78,20 +71,6 @@ func (s *cryptoStreamImpl) HandleCryptoFrame(f *wire.CryptoFrame) error {
 
 // GetCryptoData retrieves data that was received in CRYPTO frames
 func (s *cryptoStreamImpl) GetCryptoData() []byte {
-	if s.onlyCompleteMsg {
-		if len(s.msgBuf) < 4 {
-			return nil
-		}
-		msgLen := 4 + int(s.msgBuf[1])<<16 + int(s.msgBuf[2])<<8 + int(s.msgBuf[3])
-		if len(s.msgBuf) < msgLen {
-			return nil
-		}
-		msg := make([]byte, msgLen)
-		copy(msg, s.msgBuf[:msgLen])
-		s.msgBuf = s.msgBuf[msgLen:]
-		return msg
-	}
-
 	b := s.msgBuf
 	s.msgBuf = nil
 	return b

crypto_stream_test.go

@@ -1,7 +1,6 @@
 package quic
 
 import (
-	"crypto/rand"
 	"fmt"
 
 	"github.com/quic-go/quic-go/internal/protocol"
@@ -16,7 +15,7 @@ var _ = Describe("Crypto Stream", func() {
 	var str cryptoStream
 
 	BeforeEach(func() {
-		str = newCryptoStream(false)
+		str = newCryptoStream()
 	})
 
 	Context("handling incoming data", func() {
@@ -138,23 +137,4 @@ var _ = Describe("Crypto Stream", func() {
 			Expect(f.Data).To(Equal([]byte("bar")))
 		})
 	})
-
-	It("reassembles data", func() {
-		str = newCryptoStream(true)
-		data := make([]byte, 1337)
-		l := len(data) - 4
-		data[1] = uint8(l >> 16)
-		data[2] = uint8(l >> 8)
-		data[3] = uint8(l)
-		rand.Read(data[4:])
-
-		for i, b := range data {
-			Expect(str.GetCryptoData()).To(BeEmpty())
-			Expect(str.HandleCryptoFrame(&wire.CryptoFrame{
-				Offset: protocol.ByteCount(i),
-				Data:   []byte{b},
-			})).To(Succeed())
-		}
-		Expect(str.GetCryptoData()).To(Equal(data))
-	})
 })