clean

Author: lesismal

std/crypto/tls/conn.go

@@ -1208,17 +1208,9 @@ func (c *Conn) writeRecord(typ recordType, data []byte) (int, error) {
 // readHandshake reads the next handshake message from
 // the record layer.
 func (c *Conn) readHandshake() (interface{}, error) {
-	if c.isNonBlock {
-		for c.hand == nil || len(*c.hand)-c.handOff < 4 {
-			if err := c.readRecord(); err != nil {
-				return nil, err
-			}
-		}
-	} else {
-		for c.hand == nil || len(*c.hand)-c.handOff < 4 {
-			if err := c.readRecord(); err != nil {
-				return nil, err
-			}
+	for c.hand == nil || len(*c.hand)-c.handOff < 4 {
+		if err := c.readRecord(); err != nil {
+			return nil, err
 		}
 	}
 
@@ -1228,17 +1220,10 @@ func (c *Conn) readHandshake() (interface{}, error) {
 		c.sendAlertLocked(alertInternalError)
 		return nil, c.in.setErrorLocked(fmt.Errorf("tls: handshake message of length %d bytes exceeds maximum of %d bytes", n, maxHandshake))
 	}
-	if c.isNonBlock {
-		for len(*c.hand)-c.handOff < 4+n {
-			if err := c.readRecord(); err != nil {
-				return nil, err
-			}
-		}
-	} else {
-		for len(*c.hand)-c.handOff < 4+n {
-			if err := c.readRecord(); err != nil {
-				return nil, err
-			}
+
+	for len(*c.hand)-c.handOff < 4+n {
+		if err := c.readRecord(); err != nil {
+			return nil, err
 		}
 	}
 	data = (*c.hand)[c.handOff : c.handOff+4+n]