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

Merge branch 'golang-tls-upstream'

Browse source
This commit is contained in:
Sergey Frolov 2017-08-11 16:09:09 -04:00
commit 0f64b078aa
1 changed files with 19 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

44
handshake_client.go
View file

@ -30,9 +30,6 @@ type clientHandshakeState struct {
} }
func makeClientHello(config *Config) (*clientHelloMsg, error) { func makeClientHello(config *Config) (*clientHelloMsg, error) {
if config == nil {
config = defaultConfig()
}
if len(config.ServerName) == 0 && !config.InsecureSkipVerify { if len(config.ServerName) == 0 && !config.InsecureSkipVerify {
return nil, errors.New("tls: either ServerName or InsecureSkipVerify must be specified in the tls.Config") return nil, errors.New("tls: either ServerName or InsecureSkipVerify must be specified in the tls.Config")
} }
@ -45,6 +42,7 @@ func makeClientHello(config *Config) (*clientHelloMsg, error) {
nextProtosLength += 1 + l nextProtosLength += 1 + l
} }
} }
if nextProtosLength > 0xffff { if nextProtosLength > 0xffff {
return nil, errors.New("tls: NextProtos values too large") return nil, errors.New("tls: NextProtos values too large")
} }
@ -89,8 +87,8 @@ NextCipherSuite:
if hello.vers >= VersionTLS12 { if hello.vers >= VersionTLS12 {
hello.signatureAndHashes = supportedSignatureAlgorithms hello.signatureAndHashes = supportedSignatureAlgorithms
} }
return hello, nil
return hello, nil
} }
// c.out.Mutex <= L; c.handshakeMutex <= L. // c.out.Mutex <= L; c.handshakeMutex <= L.
@ -171,41 +169,35 @@ func (c *Conn) clientHandshake() error {
return err return err
} }
// If we had a successful handshake and hs.session is different from the one already cached - cache a new one // If we had a successful handshake and hs.session is different from
// the one already cached - cache a new one
if sessionCache != nil && hs.session != nil && session != hs.session { if sessionCache != nil && hs.session != nil && session != hs.session {
sessionCache.Put(cacheKey, hs.session) sessionCache.Put(cacheKey, hs.session)
} }
return nil return nil
} }
// Does the handshake, either a full one or resumes old session. // Does the handshake, either a full one or resumes old session.
// Requires hs.c, hs.hello, and, optionally, hs.session to be set. // Requires hs.c, hs.hello, and, optionally, hs.session to be set.
func (hs *clientHandshakeState) handshake() error { func (hs *clientHandshakeState) handshake() error {
if hs.c == nil {
return errors.New("tls: corrupted clientHandshakeState: hs.c is unset")
}
c := hs.c c := hs.c
if hs.hello == nil {
return errors.New("tls: corrupted clientHandshakeState: hs.hello is unset")
}
// send ClientHello // send ClientHello
if _, err := hs.c.writeRecord(recordTypeHandshake, hs.hello.marshal()); err != nil { if _, err := c.writeRecord(recordTypeHandshake, hs.hello.marshal()); err != nil {
return err return err
} }
msg, err := hs.c.readHandshake() msg, err := c.readHandshake()
if err != nil { if err != nil {
return err return err
} }
serverHello, ok := msg.(*serverHelloMsg) var ok bool
if !ok { if hs.serverHello, ok = msg.(*serverHelloMsg); !ok {
hs.c.sendAlert(alertUnexpectedMessage) c.sendAlert(alertUnexpectedMessage)
return unexpectedMessageError(serverHello, msg) return unexpectedMessageError(hs.serverHello, msg)
} }
hs.serverHello = serverHello
if err = hs.pickTLSVersion(); err != nil { if err = hs.pickTLSVersion(); err != nil {
return err return err
@ -215,12 +207,13 @@ func (hs *clientHandshakeState) handshake() error {
return err return err
} }
var isResume bool isResume, err := hs.processServerHello()
if isResume, err = hs.processServerHello(); err != nil { if err != nil {
return err return err
} }
hs.finishedHash = newFinishedHash(c.vers, hs.suite) hs.finishedHash = newFinishedHash(c.vers, hs.suite)
// No signatures of the handshake are needed in a resumption. // No signatures of the handshake are needed in a resumption.
// Otherwise, in a full handshake, if we don't have any certificates // Otherwise, in a full handshake, if we don't have any certificates
// configured then we will never send a CertificateVerify message and // configured then we will never send a CertificateVerify message and
@ -285,19 +278,20 @@ func (hs *clientHandshakeState) pickTLSVersion() error {
hs.c.sendAlert(alertProtocolVersion) hs.c.sendAlert(alertProtocolVersion)
return fmt.Errorf("tls: server selected unsupported protocol version %x", hs.serverHello.vers) return fmt.Errorf("tls: server selected unsupported protocol version %x", hs.serverHello.vers)
} }
hs.c.vers = vers hs.c.vers = vers
hs.c.haveVers = true hs.c.haveVers = true
return nil return nil
} }
func (hs *clientHandshakeState) pickCipherSuite() error { func (hs *clientHandshakeState) pickCipherSuite() error {
suite := mutualCipherSuite(hs.hello.cipherSuites, hs.serverHello.cipherSuite) if hs.suite = mutualCipherSuite(hs.hello.cipherSuites, hs.serverHello.cipherSuite); hs.suite == nil {
if suite == nil {
hs.c.sendAlert(alertHandshakeFailure) hs.c.sendAlert(alertHandshakeFailure)
return errors.New("tls: server chose an unconfigured cipher suite") return errors.New("tls: server chose an unconfigured cipher suite")
} }
hs.suite = suite
hs.c.cipherSuite = suite.id hs.c.cipherSuite = hs.suite.id
return nil return nil
} }