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

extract SHLO into separate method and test it

Browse Source
This commit is contained in:
Lucas Clemente
2016-04-17 00:31:30 +02:00
parent cbbf29e3d5
commit b5c7bcda18
2 changed files with 48 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
handshake/crypto_setup.go
View File

@@ -83,39 +83,11 @@ func (h *CryptoSetup) HandleCryptoMessage(data []byte) ([]byte, error) {
}
if scid, ok := cryptoData[TagSCID]; ok && bytes.Equal(h.scfg.ID, scid) {
// We have a CHLO matching our server config, we can continue with the 0-RTT handshake
var sharedSecret []byte
sharedSecret, err = h.scfg.kex.CalculateSharedKey(cryptoData[TagPUBS])
if err != nil {
return nil, err
}
var nonce bytes.Buffer
nonce.Write(cryptoData[TagNONC])
nonce.Write(h.nonce)
h.secureAEAD, err = crypto.DeriveKeysChacha20(false, sharedSecret, nonce.Bytes(), h.connID, data, h.scfg.Get(), h.scfg.signer.GetCertUncompressed())
if err != nil {
return nil, err
}
// TODO: Use new curve
h.forwardSecureAEAD, err = crypto.DeriveKeysChacha20(true, sharedSecret, nonce.Bytes(), h.connID, data, h.scfg.Get(), h.scfg.signer.GetCertUncompressed())
if err != nil {
return nil, err
}
var reply bytes.Buffer
WriteHandshakeMessage(&reply, TagSHLO, map[Tag][]byte{
TagPUBS: h.scfg.kex.PublicKey(),
TagSNO: h.nonce,
TagVER: protocol.SupportedVersionsAsTags,
TagICSL: []byte{0x1e, 0x00, 0x00, 0x00}, //30
TagMSPC: []byte{0x64, 0x00, 0x00, 0x00}, //100
})
return reply.Bytes(), nil
// We have a CHLO with a proper server config ID, do a 0-RTT handshake
return h.handleCHLO(data, cryptoData)
}
// We have an inacholate or non-matching CHLO, we now send a rejection
return h.handleInchoateCHLO(data)
}
@@ -139,3 +111,34 @@ func (h *CryptoSetup) handleInchoateCHLO(data []byte) ([]byte, error) {
})
return serverReply.Bytes(), nil
}
func (h *CryptoSetup) handleCHLO(data []byte, cryptoData map[Tag][]byte) ([]byte, error) {
// We have a CHLO matching our server config, we can continue with the 0-RTT handshake
sharedSecret, err := h.scfg.kex.CalculateSharedKey(cryptoData[TagPUBS])
if err != nil {
return nil, err
}
var nonce bytes.Buffer
nonce.Write(cryptoData[TagNONC])
nonce.Write(h.nonce)
h.secureAEAD, err = crypto.DeriveKeysChacha20(false, sharedSecret, nonce.Bytes(), h.connID, data, h.scfg.Get(), h.scfg.signer.GetCertUncompressed())
if err != nil {
return nil, err
}
// TODO: Use new curve
h.forwardSecureAEAD, err = crypto.DeriveKeysChacha20(true, sharedSecret, nonce.Bytes(), h.connID, data, h.scfg.Get(), h.scfg.signer.GetCertUncompressed())
if err != nil {
return nil, err
}
var reply bytes.Buffer
WriteHandshakeMessage(&reply, TagSHLO, map[Tag][]byte{
TagPUBS: h.scfg.kex.PublicKey(),
TagSNO: h.nonce,
TagVER: protocol.SupportedVersionsAsTags,
TagICSL: []byte{0x1e, 0x00, 0x00, 0x00}, //30
TagMSPC: []byte{0x64, 0x00, 0x00, 0x00}, //100
})
return reply.Bytes(), nil
}

18
handshake/crypto_setup_test.go
View File

@@ -10,7 +10,7 @@ import (
type mockKEX struct{}
func (*mockKEX) PublicKey() []byte {
return []byte("publickey")
return []byte("pubs-s")
}
func (*mockKEX) CalculateSharedKey(otherPublic []byte) ([]byte, error) {
return []byte("shared key"), nil
@@ -55,11 +55,11 @@ var _ = Describe("Crypto setup", func() {
})
It("generates REJ messages", func() {
response, err := cs.handleInchoateCHLO(sampleCHLO)
response, err := cs.handleInchoateCHLO([]byte("chlo"))
Expect(err).ToNot(HaveOccurred())
Expect(response).To(HavePrefix("REJ"))
Expect(response).To(ContainSubstring("certcompressed"))
Expect(response).To(ContainSubstring("publickey"))
Expect(response).To(ContainSubstring("pubs-s"))
Expect(signer.gotCHLO).To(BeTrue())
})
@@ -69,4 +69,16 @@ var _ = Describe("Crypto setup", func() {
Expect(err).ToNot(HaveOccurred())
Expect(signer.gotCHLO).To(BeFalse())
})
It("generates SHLO messages", func() {
response, err := cs.handleCHLO([]byte("chlo-data"), map[Tag][]byte{
TagPUBS: []byte("pubs-c"),
})
Expect(err).ToNot(HaveOccurred())
Expect(response).To(ContainSubstring("pubs-s")) // TODO: Should be new pubs
Expect(response).To(ContainSubstring(string(cs.nonce)))
Expect(response).To(ContainSubstring(string(protocol.SupportedVersionsAsTags)))
Expect(cs.secureAEAD).ToNot(BeNil())
Expect(cs.forwardSecureAEAD).ToNot(BeNil())
})
})