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

46
u_conn_test.go
View file

@ -208,17 +208,6 @@ func (test *clientTest) runUTLS(t *testing.T, write bool, helloID ClientHelloID)
func TestUTLSHandshakeClientParrotAndroid_5_1(t *testing.T) {
helloID := HelloAndroid_5_1_Browser
// As this package sometimes has to modify global vars cipherSuites and supportedSignatureAlgorithms,
// we'll back them up and restore after running the tests.
cipherSuitesBackup := make([]*cipherSuite, len(cipherSuites))
supportedSignatureAlgorithmsBackup := make([]signatureAndHash, len(supportedSignatureAlgorithms))
copy(cipherSuitesBackup, cipherSuites)
copy(supportedSignatureAlgorithmsBackup, supportedSignatureAlgorithms)
defer func() {
cipherSuites = cipherSuitesBackup
supportedSignatureAlgorithms = supportedSignatureAlgorithmsBackup
}()
// Android 5.1 offers old cipher ids for these, but current versions of OpenSSL no longer recognize old ids
// testUTLSHandshakeClientECDHE_ECDSA_WITH_CHACHA20_POLY1305(t, helloID)
// testUTLSHandshakeClientECDHE_RSA_WITH_CHACHA20_POLY1305(t, helloID)
@ -238,22 +227,10 @@ func TestUTLSHandshakeClientParrotAndroid_6_0(t *testing.T) {
// TODO: EC tests below are disabled because latest version of reference OpenSSL doesn't support p256 nor p384
// and I can't find configuration flag to enable it. Therefore I can't record replays.
// As this package sometimes has to modify global vars cipherSuites and supportedSignatureAlgorithms,
// we'll back them up and restore after running the tests.
cipherSuitesBackup := make([]*cipherSuite, len(cipherSuites))
supportedSignatureAlgorithmsBackup := make([]signatureAndHash, len(supportedSignatureAlgorithms))
copy(cipherSuitesBackup, cipherSuites)
copy(supportedSignatureAlgorithmsBackup, supportedSignatureAlgorithms)
defer func() {
cipherSuites = cipherSuitesBackup
supportedSignatureAlgorithms = supportedSignatureAlgorithmsBackup
}()
// Android 6.0 offers old cipher ids for these, but current versions of OpenSSL no longer recognize old ids
// testUTLSHandshakeClientECDHE_ECDSA_WITH_CHACHA20_POLY1305(t, helloID)
// testUTLSHandshakeClientECDHE_RSA_WITH_CHACHA20_POLY1305(t, helloID)
//testUTLSHandshakeClientECDHE_ECDSA_AES128_GCM_SHA256(t, helloID)
testUTLSHandshakeClientECDHE_RSA_AES128_GCM_SHA256(t, helloID)
//testUTLSHandshakeClientECDHE_ECDSA_AES256_CBC_SHA(t, helloID)
@ -269,17 +246,6 @@ func TestUTLSHandshakeClientParrotChrome_58(t *testing.T) {
// TODO: EC tests below are disabled because latest version of reference OpenSSL doesn't support p256 nor p384
// nor X25519 and I can't find configuration flag to enable it. Therefore I can't record replays.
// As this package sometimes has to modify global vars cipherSuites and supportedSignatureAlgorithms,
// we'll back them up and restore after running the tests.
cipherSuitesBackup := make([]*cipherSuite, len(cipherSuites))
supportedSignatureAlgorithmsBackup := make([]signatureAndHash, len(supportedSignatureAlgorithms))
copy(cipherSuitesBackup, cipherSuites)
copy(supportedSignatureAlgorithmsBackup, supportedSignatureAlgorithms)
defer func() {
cipherSuites = cipherSuitesBackup
supportedSignatureAlgorithms = supportedSignatureAlgorithmsBackup
}()
//testUTLSHandshakeClientECDHE_ECDSA_AES128_GCM_SHA256(t, helloID)
testUTLSHandshakeClientECDHE_RSA_AES128_GCM_SHA256(t, helloID)
//testUTLSHandshakeClientECDHE_ECDSA_AES256_GCM_SHA256(t, helloID)
@ -294,21 +260,9 @@ func TestUTLSHandshakeClientParrotChrome_58(t *testing.T) {
testUTLSHandshakeClientRSA_AES128_GCM_SHA256(t, helloID)
}
func TestUTLSHandshakeClientParrotFirefox_55(t *testing.T) {
helloID := HelloFirefox_55
// As this package sometimes has to modify global vars cipherSuites and supportedSignatureAlgorithms,
// we'll back them up and restore after running the tests.
cipherSuitesBackup := make([]*cipherSuite, len(cipherSuites))
supportedSignatureAlgorithmsBackup := make([]signatureAndHash, len(supportedSignatureAlgorithms))
copy(cipherSuitesBackup, cipherSuites)
copy(supportedSignatureAlgorithmsBackup, supportedSignatureAlgorithms)
defer func() {
cipherSuites = cipherSuitesBackup
supportedSignatureAlgorithms = supportedSignatureAlgorithmsBackup
}()
testUTLSHandshakeClientECDHE_ECDSA_AES128_GCM_SHA256(t, helloID)
testUTLSHandshakeClientECDHE_RSA_AES128_GCM_SHA256(t, helloID)