Not a Go 1 issue, but appeared to be fairly easy to fix. - Note that a few existing test cases look slightly worse but those cases were not representative for real code. All real code looks better now. - Manual move of the comment in go/scanner/example_test.go before applying gofmt. - gofmt -w $GOROOT/src $GOROOT/misc Fixes #3062. R=rsc CC=golang-dev https://golang.org/cl/5674093tls13
@@ -273,7 +273,7 @@ func (c *Conn) clientHandshake() error { | |||||
masterSecret, clientMAC, serverMAC, clientKey, serverKey, clientIV, serverIV := | masterSecret, clientMAC, serverMAC, clientKey, serverKey, clientIV, serverIV := | ||||
keysFromPreMasterSecret(c.vers, preMasterSecret, hello.random, serverHello.random, suite.macLen, suite.keyLen, suite.ivLen) | keysFromPreMasterSecret(c.vers, preMasterSecret, hello.random, serverHello.random, suite.macLen, suite.keyLen, suite.ivLen) | ||||
clientCipher := suite.cipher(clientKey, clientIV, false /* not for reading */ ) | |||||
clientCipher := suite.cipher(clientKey, clientIV, false /* not for reading */) | |||||
clientHash := suite.mac(c.vers, clientMAC) | clientHash := suite.mac(c.vers, clientMAC) | ||||
c.out.prepareCipherSpec(c.vers, clientCipher, clientHash) | c.out.prepareCipherSpec(c.vers, clientCipher, clientHash) | ||||
c.writeRecord(recordTypeChangeCipherSpec, []byte{1}) | c.writeRecord(recordTypeChangeCipherSpec, []byte{1}) | ||||
@@ -294,7 +294,7 @@ func (c *Conn) clientHandshake() error { | |||||
finishedHash.Write(finished.marshal()) | finishedHash.Write(finished.marshal()) | ||||
c.writeRecord(recordTypeHandshake, finished.marshal()) | c.writeRecord(recordTypeHandshake, finished.marshal()) | ||||
serverCipher := suite.cipher(serverKey, serverIV, true /* for reading */ ) | |||||
serverCipher := suite.cipher(serverKey, serverIV, true /* for reading */) | |||||
serverHash := suite.mac(c.vers, serverMAC) | serverHash := suite.mac(c.vers, serverMAC) | ||||
c.in.prepareCipherSpec(c.vers, serverCipher, serverHash) | c.in.prepareCipherSpec(c.vers, serverCipher, serverHash) | ||||
c.readRecord(recordTypeChangeCipherSpec) | c.readRecord(recordTypeChangeCipherSpec) | ||||
@@ -295,7 +295,7 @@ FindCipherSuite: | |||||
masterSecret, clientMAC, serverMAC, clientKey, serverKey, clientIV, serverIV := | masterSecret, clientMAC, serverMAC, clientKey, serverKey, clientIV, serverIV := | ||||
keysFromPreMasterSecret(c.vers, preMasterSecret, clientHello.random, hello.random, suite.macLen, suite.keyLen, suite.ivLen) | keysFromPreMasterSecret(c.vers, preMasterSecret, clientHello.random, hello.random, suite.macLen, suite.keyLen, suite.ivLen) | ||||
clientCipher := suite.cipher(clientKey, clientIV, true /* for reading */ ) | |||||
clientCipher := suite.cipher(clientKey, clientIV, true /* for reading */) | |||||
clientHash := suite.mac(c.vers, clientMAC) | clientHash := suite.mac(c.vers, clientMAC) | ||||
c.in.prepareCipherSpec(c.vers, clientCipher, clientHash) | c.in.prepareCipherSpec(c.vers, clientCipher, clientHash) | ||||
c.readRecord(recordTypeChangeCipherSpec) | c.readRecord(recordTypeChangeCipherSpec) | ||||
@@ -333,7 +333,7 @@ FindCipherSuite: | |||||
finishedHash.Write(clientFinished.marshal()) | finishedHash.Write(clientFinished.marshal()) | ||||
serverCipher := suite.cipher(serverKey, serverIV, false /* not for reading */ ) | |||||
serverCipher := suite.cipher(serverKey, serverIV, false /* not for reading */) | |||||
serverHash := suite.mac(c.vers, serverMAC) | serverHash := suite.mac(c.vers, serverMAC) | ||||
c.out.prepareCipherSpec(c.vers, serverCipher, serverHash) | c.out.prepareCipherSpec(c.vers, serverCipher, serverHash) | ||||
c.writeRecord(recordTypeChangeCipherSpec, []byte{1}) | c.writeRecord(recordTypeChangeCipherSpec, []byte{1}) | ||||