From d226f70cd7dc3875c3ad82d35c56b4fb932e9da5 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Mon, 14 Dec 2020 11:30:51 +0700 Subject: [PATCH] allow up to 20 byte for the initial connection IDs --- internal/protocol/connection_id.go | 4 ++-- internal/protocol/connection_id_test.go | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/protocol/connection_id.go b/internal/protocol/connection_id.go index f99461b2..d4c4a3aa 100644 --- a/internal/protocol/connection_id.go +++ b/internal/protocol/connection_id.go @@ -10,7 +10,7 @@ import ( // A ConnectionID in QUIC type ConnectionID []byte -const maxConnectionIDLen = 18 +const maxConnectionIDLen = 20 // GenerateConnectionID generates a connection ID using cryptographic random func GenerateConnectionID(len int) (ConnectionID, error) { @@ -22,7 +22,7 @@ func GenerateConnectionID(len int) (ConnectionID, error) { } // GenerateConnectionIDForInitial generates a connection ID for the Initial packet. -// It uses a length randomly chosen between 8 and 18 bytes. +// It uses a length randomly chosen between 8 and 20 bytes. func GenerateConnectionIDForInitial() (ConnectionID, error) { r := make([]byte, 1) if _, err := rand.Read(r); err != nil { diff --git a/internal/protocol/connection_id_test.go b/internal/protocol/connection_id_test.go index f0c7f7cc..256d4c31 100644 --- a/internal/protocol/connection_id_test.go +++ b/internal/protocol/connection_id_test.go @@ -25,21 +25,21 @@ var _ = Describe("Connection ID generation", func() { }) It("generates random length destination connection IDs", func() { - var has8ByteConnID, has18ByteConnID bool + var has8ByteConnID, has20ByteConnID bool for i := 0; i < 1000; i++ { c, err := GenerateConnectionIDForInitial() Expect(err).ToNot(HaveOccurred()) Expect(c.Len()).To(BeNumerically(">=", 8)) - Expect(c.Len()).To(BeNumerically("<=", 18)) + Expect(c.Len()).To(BeNumerically("<=", 20)) if c.Len() == 8 { has8ByteConnID = true } - if c.Len() == 18 { - has18ByteConnID = true + if c.Len() == 20 { + has20ByteConnID = true } } Expect(has8ByteConnID).To(BeTrue()) - Expect(has18ByteConnID).To(BeTrue()) + Expect(has20ByteConnID).To(BeTrue()) }) It("says if connection IDs are equal", func() {