gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

don't modify the tls.Config when generating the qtls.Config

Browse Source 
This fixes a race conditions when dialing or accepting multiple
connections using the same tls.Config.
This commit is contained in:
Marten Seemann
2018-11-27 11:17:13 +07:00
parent dd81dfdbdd
commit 4bf47870bc
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
internal/handshake/qtls.go
View File

@@ -11,11 +11,13 @@ func tlsConfigToQtlsConfig(c *tls.Config) *qtls.Config {
c = &tls.Config{} c = &tls.Config{}
} }
// QUIC requires TLS 1.3 or newer // QUIC requires TLS 1.3 or newer
if c.MinVersion < qtls.VersionTLS13 { minVersion := c.MinVersion
c.MinVersion = qtls.VersionTLS13 if minVersion < qtls.VersionTLS13 {
minVersion = qtls.VersionTLS13
} }
if c.MaxVersion < qtls.VersionTLS13 { maxVersion := c.MaxVersion
c.MaxVersion = qtls.VersionTLS13 if maxVersion < qtls.VersionTLS13 {
maxVersion = qtls.VersionTLS13
} }
return &qtls.Config{ return &qtls.Config{
Rand: c.Rand, Rand: c.Rand,
@@ -38,8 +40,8 @@ func tlsConfigToQtlsConfig(c *tls.Config) *qtls.Config {
PreferServerCipherSuites: c.PreferServerCipherSuites, PreferServerCipherSuites: c.PreferServerCipherSuites,
SessionTicketsDisabled: c.SessionTicketsDisabled, SessionTicketsDisabled: c.SessionTicketsDisabled,
SessionTicketKey: c.SessionTicketKey, SessionTicketKey: c.SessionTicketKey,
MinVersion: c.MinVersion, MinVersion: minVersion,
MaxVersion: c.MaxVersion, MaxVersion: maxVersion,
CurvePreferences: c.CurvePreferences, CurvePreferences: c.CurvePreferences,
DynamicRecordSizingDisabled: c.DynamicRecordSizingDisabled, DynamicRecordSizingDisabled: c.DynamicRecordSizingDisabled,
Renegotiation: c.Renegotiation, Renegotiation: c.Renegotiation,