gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

send a reserved version number in the SHLO

Browse Source
This commit is contained in:
Marten Seemann
2017-11-30 12:59:53 +07:00
parent 1a3852aec6
commit 8c2404edf5
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/handshake/crypto_setup_server.go
View File

@@ -431,7 +431,7 @@ func (h *cryptoSetupServer) handleCHLO(sni string, data []byte, cryptoData map[T
replyMap := h.params.getHelloMap()
// add crypto parameters
verTag := &bytes.Buffer{}
for _, v := range h.supportedVersions {
for _, v := range protocol.GetGreasedVersions(h.supportedVersions) {
utils.BigEndian.WriteUint32(verTag, uint32(v))
}
replyMap[TagPUBS] = ephermalKex.PublicKey()

11
internal/handshake/crypto_setup_server_test.go
View File

@@ -313,12 +313,17 @@ var _ = Describe("Server Crypto Setup", func() {
})
Expect(err).ToNot(HaveOccurred())
Expect(response).To(HavePrefix("SHLO"))
Expect(response).To(ContainSubstring("ephermal pub"))
Expect(response).To(ContainSubstring("SNO\x00"))
message, err := ParseHandshakeMessage(bytes.NewReader(response))
Expect(err).ToNot(HaveOccurred())
Expect(message.Data).To(HaveKeyWithValue(TagPUBS, []byte("ephermal pub")))
Expect(message.Data).To(HaveKey(TagSNO))
Expect(message.Data).To(HaveKey(TagVER))
// the supported versions should include one reserved version number
Expect(message.Data[TagVER]).To(HaveLen(4*len(supportedVersions) + 4))
for _, v := range supportedVersions {
b := &bytes.Buffer{}
utils.BigEndian.WriteUint32(b, uint32(v))
Expect(response).To(ContainSubstring(string(b.Bytes())))
Expect(message.Data[TagVER]).To(ContainSubstring(string(b.Bytes())))
}
Expect(checkedSecure).To(BeTrue())
Expect(checkedForwardSecure).To(BeTrue())