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

Fixes #5

Browse source 
The root cause of races is that global variables supportedSignatureAlgorithms and
cipherSuites are used both to form handshake and to check whether or not
peer responded with supported algorithm.
In this patch I create separate variables for this purpose.
Updated tests for kicks.
Finally, go fmt.
This commit is contained in:
Sergey Frolov 2017-08-16 16:10:12 -04:00
parent 09f732cdd6
commit fd96e317e6
31 changed files with 961 additions and 1032 deletions
Download patch file Download diff file Expand all files Collapse all files

34
u_common.go
View file

@ -4,7 +4,9 @@
package tls
import "fmt"
import (
"fmt"
)
// Naming convention:
// Unsupported things are prefixed with "Fake"
@ -99,25 +101,15 @@ var (
HelloAndroid_5_1_Browser ClientHelloID = ClientHelloID{helloAndroid, 22}
)
// Appends newCipher to cipherSuites, if not there already
// Used to add old cipher ids
func appendToGlobalCipherSuites(newCipher *cipherSuite) {
for _, c := range cipherSuites {
if c.id == newCipher.id {
return
}
}
cipherSuites = append(cipherSuites, newCipher)
}
var utlsSupportedSignatureAlgorithms []signatureAndHash
var utlsSupportedCipherSuites []*cipherSuite
// Appends {hash, sig} to supportedSignatureAlgorithms, if not there already
// Used to enable already supported but disabled signatures
func appendToGlobalSigAlgs(hash uint8, sig uint8) {
s := signatureAndHash{hash, sig}
for _, c := range supportedSignatureAlgorithms {
if c.hash == s.hash && c.signature == s.signature {
return
}
}
supportedSignatureAlgorithms = append(supportedSignatureAlgorithms, s)
func init() {
utlsSupportedSignatureAlgorithms = append(supportedSignatureAlgorithms,
[]signatureAndHash{{disabledHashSHA512, signatureRSA}, {disabledHashSHA512, signatureECDSA}}...)
utlsSupportedCipherSuites = append(cipherSuites, []*cipherSuite{
{OLD_TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256, 32, 0, 12, ecdheRSAKA,
suiteECDHE | suiteTLS12 | suiteDefaultOff, nil, nil, aeadChaCha20Poly1305},
{OLD_TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256, 32, 0, 12, ecdheECDSAKA,
suiteECDHE | suiteECDSA | suiteTLS12 | suiteDefaultOff, nil, nil, aeadChaCha20Poly1305}}...)
}