kirillius
/
Cloak
mirror of https://github.com/cbeuw/Cloak
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use byte literals instead of decoding hex

This commit is contained in:
Andy Wang 2020-08-10 14:29:51 +01:00
parent 6bd2e8fe1e
commit 2bb102a5b6
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/server/TLSAux.go
View File

@ -3,7 +3,6 @@ package server
import ( import (
"bytes" "bytes"
"encoding/binary" "encoding/binary"
"encoding/hex"
"errors" "errors"
"fmt" "fmt"
"github.com/cbeuw/Cloak/internal/common" "github.com/cbeuw/Cloak/internal/common"
@ -173,13 +172,13 @@ func composeServerHello(sessionId []byte, nonce [12]byte, encryptedSessionKeyWit
serverHello[7] = []byte{0x00} // compression method null serverHello[7] = []byte{0x00} // compression method null
serverHello[8] = []byte{0x00, 0x2e} // extensions length 46 serverHello[8] = []byte{0x00, 0x2e} // extensions length 46
keyShare, _ := hex.DecodeString("00330024001d0020") keyShare := []byte{0x00, 0x33, 0x00, 0x24, 0x00, 0x1d, 0x00, 0x20}
keyExchange := make([]byte, 32) keyExchange := make([]byte, 32)
copy(keyExchange, encryptedSessionKeyWithTag[20:48]) copy(keyExchange, encryptedSessionKeyWithTag[20:48])
common.CryptoRandRead(keyExchange[28:32]) common.CryptoRandRead(keyExchange[28:32])
serverHello[9] = append(keyShare, keyExchange...) serverHello[9] = append(keyShare, keyExchange...)
serverHello[10], _ = hex.DecodeString("002b00020304") serverHello[10] = []byte{0x00, 0x2b, 0x00, 0x02, 0x03, 0x04} // supported versions
var ret []byte var ret []byte
for _, s := range serverHello { for _, s := range serverHello {
ret = append(ret, s...) ret = append(ret, s...)