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

Remove appendToGlobalCipherSuites

Browse source 
This function is not needed anymore, since check for whether ciphersuite is
supported is done against per-tls.Config, not against global variable.
One of needed changes for fixing data races, see #5
This commit is contained in:
Sergey Frolov 2017-08-15 12:48:48 -04:00
parent 1e0af1a3f4
commit 0af497570e
3 changed files with 0 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

10
u_common.go
View file

@ -101,16 +101,6 @@ var (
HelloAndroid_5_1_Browser ClientHelloID = ClientHelloID{helloAndroid, 22} 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)
}
// Appends {hash, sig} to supportedSignatureAlgorithms, if not there already // Appends {hash, sig} to supportedSignatureAlgorithms, if not there already
// Used to enable already supported but disabled signatures // Used to enable already supported but disabled signatures

9
u_conn_test.go
View file

@ -210,12 +210,9 @@ func TestUTLSHandshakeClientParrotAndroid_5_1(t *testing.T) {
// As this package sometimes has to modify global vars cipherSuites and supportedSignatureAlgorithms, // As this package sometimes has to modify global vars cipherSuites and supportedSignatureAlgorithms,
// we'll back them up and restore after running the tests. // we'll back them up and restore after running the tests.
cipherSuitesBackup := make([]*cipherSuite, len(cipherSuites))
supportedSignatureAlgorithmsBackup := make([]signatureAndHash, len(supportedSignatureAlgorithms)) supportedSignatureAlgorithmsBackup := make([]signatureAndHash, len(supportedSignatureAlgorithms))
copy(cipherSuitesBackup, cipherSuites)
copy(supportedSignatureAlgorithmsBackup, supportedSignatureAlgorithms) copy(supportedSignatureAlgorithmsBackup, supportedSignatureAlgorithms)
defer func() { defer func() {
cipherSuites = cipherSuitesBackup
supportedSignatureAlgorithms = supportedSignatureAlgorithmsBackup supportedSignatureAlgorithms = supportedSignatureAlgorithmsBackup
}() }()
@ -239,12 +236,9 @@ func disabledtestUTLSHandshakeClientParrotAndroid_6_0(t *testing.T) {
// As this package sometimes has to modify global vars cipherSuites and supportedSignatureAlgorithms, // As this package sometimes has to modify global vars cipherSuites and supportedSignatureAlgorithms,
// we'll back them up and restore after running the tests. // we'll back them up and restore after running the tests.
cipherSuitesBackup := make([]*cipherSuite, len(cipherSuites))
supportedSignatureAlgorithmsBackup := make([]signatureAndHash, len(supportedSignatureAlgorithms)) supportedSignatureAlgorithmsBackup := make([]signatureAndHash, len(supportedSignatureAlgorithms))
copy(cipherSuitesBackup, cipherSuites)
copy(supportedSignatureAlgorithmsBackup, supportedSignatureAlgorithms) copy(supportedSignatureAlgorithmsBackup, supportedSignatureAlgorithms)
defer func() { defer func() {
cipherSuites = cipherSuitesBackup
supportedSignatureAlgorithms = supportedSignatureAlgorithmsBackup supportedSignatureAlgorithms = supportedSignatureAlgorithmsBackup
}() }()
@ -268,12 +262,9 @@ func disabledtestUTLSHandshakeClientParrotChrome_58(t *testing.T) {
// As this package sometimes has to modify global vars cipherSuites and supportedSignatureAlgorithms, // As this package sometimes has to modify global vars cipherSuites and supportedSignatureAlgorithms,
// we'll back them up and restore after running the tests. // we'll back them up and restore after running the tests.
cipherSuitesBackup := make([]*cipherSuite, len(cipherSuites))
supportedSignatureAlgorithmsBackup := make([]signatureAndHash, len(supportedSignatureAlgorithms)) supportedSignatureAlgorithmsBackup := make([]signatureAndHash, len(supportedSignatureAlgorithms))
copy(cipherSuitesBackup, cipherSuites)
copy(supportedSignatureAlgorithmsBackup, supportedSignatureAlgorithms) copy(supportedSignatureAlgorithmsBackup, supportedSignatureAlgorithms)
defer func() { defer func() {
cipherSuites = cipherSuitesBackup
supportedSignatureAlgorithms = supportedSignatureAlgorithmsBackup supportedSignatureAlgorithms = supportedSignatureAlgorithmsBackup
}() }()

8
u_parrots.go
View file

@ -164,10 +164,6 @@ func (uconn *UConn) parrotAndroid_6_0() error {
hello := uconn.HandshakeState.Hello hello := uconn.HandshakeState.Hello
session := uconn.HandshakeState.Session session := uconn.HandshakeState.Session
appendToGlobalCipherSuites(&cipherSuite{OLD_TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256, 32, 0, 12,
ecdheRSAKA, suiteECDHE | suiteTLS12, nil, nil, aeadChaCha20Poly1305})
appendToGlobalCipherSuites(&cipherSuite{OLD_TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256, 32, 0, 12,
ecdheECDSAKA, suiteECDHE | suiteECDSA | suiteTLS12, nil, nil, aeadChaCha20Poly1305})
hello.CipherSuites = []uint16{ hello.CipherSuites = []uint16{
OLD_TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256, OLD_TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,
OLD_TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256, OLD_TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,
@ -243,10 +239,6 @@ func (uconn *UConn) parrotAndroid_5_1() error {
hello := uconn.HandshakeState.Hello hello := uconn.HandshakeState.Hello
session := uconn.HandshakeState.Session session := uconn.HandshakeState.Session
appendToGlobalCipherSuites(&cipherSuite{OLD_TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256, 32, 0, 12,
ecdheRSAKA, suiteECDHE | suiteTLS12, nil, nil, aeadChaCha20Poly1305})
appendToGlobalCipherSuites(&cipherSuite{OLD_TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256, 32, 0, 12,
ecdheECDSAKA, suiteECDHE | suiteECDSA | suiteTLS12, nil, nil, aeadChaCha20Poly1305})
hello.CipherSuites = []uint16{ hello.CipherSuites = []uint16{
OLD_TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256, OLD_TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,
OLD_TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256, OLD_TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,