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

Solve a data race

This commit is contained in:
Qian Wang 2019-06-15 11:52:46 +10:00
parent 589900fe52
commit ef185b00f0
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/multiplex/obfs.go
View File

@ -41,8 +41,10 @@ func MakeObfs(key []byte, algo Crypto) Obfser {
return nil, err return nil, err
} }
cKey := make([]byte, len(key))
copy(cKey, key)
salt := encryptedPayload[len(encryptedPayload)-16:] salt := encryptedPayload[len(encryptedPayload)-16:]
xorKey := genXorKey(key, salt) xorKey := genXorKey(cKey, salt)
xor(header, xorKey) xor(header, xorKey)
// Composing final obfsed message // Composing final obfsed message
@ -72,7 +74,9 @@ func MakeDeobfs(key []byte, algo Crypto) Deobfser {
payload := peeled[12:] payload := peeled[12:]
salt := peeled[len(peeled)-16:] salt := peeled[len(peeled)-16:]
xorKey := genXorKey(key, salt) cKey := make([]byte, len(key))
copy(cKey, key)
xorKey := genXorKey(cKey, salt)
xor(header, xorKey) xor(header, xorKey)
streamID := u32(header[0:4]) streamID := u32(header[0:4])