From 284b86c02cc6e64b57f97d91db3b778b5ca5a1f7 Mon Sep 17 00:00:00 2001 From: Lucas Clemente Date: Tue, 12 Apr 2016 15:29:26 +0200 Subject: [PATCH] send proper kex value in example server --- crypto_stream.go | 4 ++-- example/main.go | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/crypto_stream.go b/crypto_stream.go index 45d118da..1d7f2677 100644 --- a/crypto_stream.go +++ b/crypto_stream.go @@ -68,8 +68,8 @@ const ( TagAEAD Tag = 'A' + 'E'<<8 + 'A'<<16 + 'D'<<24 // TagPUBS is the public value for the KEX TagPUBS Tag = 'P' + 'U'<<8 + 'B'<<16 + 'S'<<24 - // TagORBT is the client orbit - TagORBT Tag = 'O' + 'R'<<8 + 'B'<<16 + 'T'<<24 + // TagOBIT is the client orbit + TagOBIT Tag = 'O' + 'B'<<8 + 'I'<<16 + 'T'<<24 // TagEXPY is the server config expiry TagEXPY Tag = 'E' + 'X'<<8 + 'P'<<16 + 'Y'<<24 // TagCERT is the CERT data diff --git a/example/main.go b/example/main.go index 9059c84e..7153a3db 100644 --- a/example/main.go +++ b/example/main.go @@ -82,13 +82,15 @@ func main() { fmt.Printf("Tag: %d\n", messageTag) fmt.Printf("Talking to: %q\n", cryptoData[quic.TagUAID]) + kex := crypto.NewCurve25519KEX() + serverConfig := &bytes.Buffer{} quic.WriteCryptoMessage(serverConfig, quic.TagSCFG, map[quic.Tag][]byte{ quic.TagSCID: []byte{0xC5, 0x1C, 0x73, 0x6B, 0x8F, 0x48, 0x49, 0xAE, 0xB3, 0x00, 0xA2, 0xD4, 0x4B, 0xA0, 0xCF, 0xDF}, quic.TagKEXS: []byte("C255"), quic.TagAEAD: []byte("AESG"), - quic.TagPUBS: []byte{0x1, 0x2, 0x3}, - quic.TagORBT: []byte{0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7}, + quic.TagPUBS: append([]byte{0x20, 0x00, 0x00}, kex.PublicKey()...), + quic.TagOBIT: []byte{0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7}, quic.TagEXPY: []byte{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, quic.TagVER: []byte("Q032"), })