mirrors/utls
1
0
Fork 0
mirror of https://github.com/refraction-networking/utls.git synced 2025-04-06 05:27:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

RandomizedHello: fix cipherSuite' shuffling

Browse source
This commit is contained in:
Sergey Frolov 2017-09-06 19:26:16 -06:00
parent 21fd80b8b6
commit 5893031118
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
u_parrots.go
View file

@ -407,11 +407,11 @@ func (uconn *UConn) parrotRandomizedNoALPN() error {
hello.CipherSuites = make([]uint16, len(defaultCipherSuites())) hello.CipherSuites = make([]uint16, len(defaultCipherSuites()))
copy(hello.CipherSuites, defaultCipherSuites()) copy(hello.CipherSuites, defaultCipherSuites())
hello.CipherSuites = removeRandomCiphers(hello.CipherSuites, 0.4) shuffledSuites, err := shuffledCiphers()
err := shuffleCiphers(hello.CipherSuites)
if err != nil { if err != nil {
return err return err
} }
hello.CipherSuites = removeRandomCiphers(shuffledSuites, 0.4)
err = uconn.fillClientHelloHeader() err = uconn.fillClientHelloHeader()
if err != nil { if err != nil {
return err return err
@ -554,12 +554,11 @@ func getRandPerm(n int) ([]int, error) {
return permArray, nil return permArray, nil
} }
func shuffleCiphers(s []uint16) error { func shuffledCiphers() ([]uint16, error) {
// shuffles array in place
ciphers := make(sortableCiphers, len(cipherSuites)) ciphers := make(sortableCiphers, len(cipherSuites))
perm, err := getRandPerm(len(cipherSuites)) perm, err := getRandPerm(len(cipherSuites))
if err != nil { if err != nil {
return err return nil, err
} }
for i, suite := range cipherSuites { for i, suite := range cipherSuites {
ciphers[i] = sortableCipher{suite: suite.id, ciphers[i] = sortableCipher{suite: suite.id,
@ -567,8 +566,7 @@ func shuffleCiphers(s []uint16) error {
randomTag: perm[i]} randomTag: perm[i]}
} }
sort.Sort(ciphers) sort.Sort(ciphers)
s = ciphers.GetCiphers() return ciphers.GetCiphers(), nil
return nil
} }
type sortableCipher struct { type sortableCipher struct {