Merge pull request #17 from Kotodian/master

pub init problem

Author: lesismal

std/crypto/tls/conn.go

@@ -688,12 +688,14 @@ func (c *Conn) ResetOrFreeBuffer() {
 
 // readRecordOrCCS reads one or more TLS records from the connection and
 // updates the record layer state. Some invariants:
-//   * c.in must be locked
-//   * c.input must be empty
+//   - c.in must be locked
+//   - c.input must be empty
+//
 // During the handshake one and only one of the following will happen:
 //   - c.hand grows
 //   - c.in.changeCipherSpec is called
 //   - an error is returned
+//
 // After the handshake one and only one of the following will happen:
 //   - c.hand grows
 //   - c.input is set
@@ -1561,7 +1563,6 @@ func (c *Conn) AppendAndRead(bufAppend []byte, bufRead []byte) (int, int, error)
 		}
 		c.rawInput = c.allocator.Append(c.rawInput, bufAppend...)
 	}
-
 	if err := c.Handshake(); err != nil {
 		if c.isNonBlock && err == errDataNotEnough {
 			return len(bufAppend), 0, nil
@@ -1702,7 +1703,6 @@ func (c *Conn) Handshake() error {
 
 	// c.in.Lock()
 	// defer c.in.Unlock()
-
 	c.handshakeErr = c.handshakeFn()
 	if c.isNonBlock && c.handshakeErr == errDataNotEnough {
 		c.handshakeErr = nil

std/crypto/tls/handshake_server.go

@@ -104,7 +104,6 @@ func (c *Conn) serverHandshake() error {
 		}
 		return hs.handshake()
 	}
-
 	hs := c.hs
 	if hs == nil {
 		hs = &serverHandshakeState{
@@ -124,7 +123,6 @@ func (hs *serverHandshakeState) handshake() error {
 	if hs.err != nil && hs.err != errDataNotEnough {
 		return hs.err
 	}
-
 	if err := hs.processClientHello(); err != nil {
 		hs.err = err
 		return err
@@ -203,7 +201,6 @@ func (hs *serverHandshakeState) handshake() error {
 	atomic.StoreUint32(&c.handshakeStatus, 1)
 
 	c.handshakeStatusAsync = stateServerHandshakeHandshakeDone
-
 	return nil
 }
 
@@ -651,8 +648,8 @@ func (hs *serverHandshakeState) doFullHandshake() error {
 				return err
 			}
 		}
-
 		if c.config.ClientAuth >= RequestClientCert {
+			// Request a client certificate
 			initCertReq()
 			hs.finishedHash.Write(certReq.marshal())
 			if _, err := c.writeRecord(recordTypeHandshake, certReq.marshal()); err != nil {
@@ -669,6 +666,7 @@ func (hs *serverHandshakeState) doFullHandshake() error {
 		if _, err := c.flush(); err != nil {
 			return err
 		}
+
 	}
 
 	if c.handshakeStatusAsync < stateServerHandshakeDoFullHandshake2ReadHandshake1 {
@@ -684,7 +682,6 @@ func (hs *serverHandshakeState) doFullHandshake() error {
 
 	// If we requested a client certificate, then the client must send a
 	// certificate message, even if it's empty.
-
 	if c.config.ClientAuth >= RequestClientCert {
 		if c.handshakeStatusAsync < stateServerHandshakeDoFullHandshake2HandleCertificateMsg {
 			c.handshakeStatusAsync = stateServerHandshakeDoFullHandshake2HandleCertificateMsg
@@ -717,7 +714,6 @@ func (hs *serverHandshakeState) doFullHandshake() error {
 
 		}
 	}
-
 	if c.handshakeStatusAsync < stateServerHandshakeDoFullHandshake2HandleVerifyConnection {
 		c.handshakeStatusAsync = stateServerHandshakeDoFullHandshake2HandleVerifyConnection
 		if c.config.VerifyConnection != nil {
@@ -747,7 +743,6 @@ func (hs *serverHandshakeState) doFullHandshake() error {
 		}
 
 	}
-
 	if c.handshakeStatusAsync >= stateServerHandshakeDoFullHandshake2ReadHandshake3 {
 		return nil
 	}
@@ -771,7 +766,6 @@ func (hs *serverHandshakeState) doFullHandshake() error {
 			c.handshakeStatusAsync = stateServerHandshakeDoFullHandshake2ReadHandshake3
 			return unexpectedMessageError(certVerify, msg)
 		}
-
 		var sigType uint8
 		var sigHash crypto.Hash
 		if c.vers >= VersionTLS12 {
@@ -796,6 +790,11 @@ func (hs *serverHandshakeState) doFullHandshake() error {
 		}
 
 		signed := hs.finishedHash.hashForClientCertificate(sigType, sigHash, hs.masterSecret)
+		if pub == nil {
+			if len(c.peerCertificates) > 0 {
+				pub = c.peerCertificates[0].PublicKey
+			}
+		}
 		if err := verifyHandshakeSignature(sigType, pub, sigHash, signed, certVerify.signature); err != nil {
 			c.sendAlert(alertDecryptError)
 			c.handshakeStatusAsync = stateServerHandshakeDoFullHandshake2ReadHandshake3