crypto/tls: make closeNotify a warning alert.

The RFC doesn't actually have an opinion on whether this is a fatal or
warning level alert, but common practice suggests that it should be a
warning.

This involves rebasing most of the tests.

Fixes #3413.

R=golang-dev, shanemhansen, rsc
CC=golang-dev
https://golang.org/cl/6654050

src/pkg/crypto/tls/conn.go

@@ -604,9 +604,11 @@ Again:
 // sendAlert sends a TLS alert message.
 // c.out.Mutex <= L.
 func (c *Conn) sendAlertLocked(err alert) error {
-	c.tmp[0] = alertLevelError
-	if err == alertNoRenegotiation {
+	switch err {
+	case alertNoRenegotiation, alertCloseNotify:
 		c.tmp[0] = alertLevelWarning
+	default:
+		c.tmp[0] = alertLevelError
 	}
 	c.tmp[1] = byte(err)
 	c.writeRecord(recordTypeAlert, c.tmp[0:2])

src/pkg/crypto/tls/handshake_client_test.go

@@ -246,15 +246,15 @@ var ecdheAESClientScript = [][]byte{
 	},
 	{
 		0x16, 0x03, 0x01, 0x00, 0x54, 0x02, 0x00, 0x00,
-		0x50, 0x03, 0x01, 0x4f, 0x7f, 0x24, 0x25, 0x10,
-		0xa8, 0x9d, 0xb1, 0x33, 0xd6, 0x53, 0x81, 0xce,
-		0xb0, 0x69, 0xed, 0x1b, 0x9c, 0x5e, 0x40, 0x3a,
-		0x4d, 0x06, 0xbc, 0xc7, 0x84, 0x51, 0x5a, 0x30,
-		0x40, 0x50, 0x48, 0x20, 0xcd, 0x91, 0x80, 0x08,
-		0xff, 0x82, 0x38, 0xc6, 0x03, 0x2d, 0x45, 0x4c,
-		0x91, 0xbb, 0xcc, 0x27, 0x3d, 0x58, 0xff, 0x0d,
-		0x26, 0x34, 0x7b, 0x48, 0x7a, 0xce, 0x25, 0x20,
-		0x90, 0x0f, 0x35, 0x9f, 0xc0, 0x13, 0x00, 0x00,
+		0x50, 0x03, 0x01, 0x50, 0x77, 0x31, 0xf7, 0x5b,
+		0xdb, 0x3d, 0x7a, 0x62, 0x76, 0x70, 0x95, 0x33,
+		0x73, 0x71, 0x13, 0xfe, 0xa3, 0xb1, 0xd8, 0xb3,
+		0x4d, 0x0d, 0xdc, 0xfe, 0x58, 0x6e, 0x6a, 0x3a,
+		0xf9, 0xde, 0xdc, 0x20, 0x8e, 0xfa, 0x3d, 0x60,
+		0xd0, 0xda, 0xa4, 0x0e, 0x36, 0xf0, 0xde, 0xb6,
+		0x81, 0xb4, 0x80, 0x5e, 0xf9, 0xd2, 0x4c, 0xec,
+		0xd1, 0x9c, 0x2a, 0x81, 0xc3, 0x36, 0x0b, 0x0f,
+		0x4a, 0x3d, 0xdf, 0x75, 0xc0, 0x13, 0x00, 0x00,
 		0x08, 0x00, 0x0b, 0x00, 0x04, 0x03, 0x00, 0x01,
 		0x02, 0x16, 0x03, 0x01, 0x02, 0x39, 0x0b, 0x00,
 		0x02, 0x35, 0x00, 0x02, 0x32, 0x00, 0x02, 0x2f,
@@ -329,23 +329,23 @@ var ecdheAESClientScript = [][]byte{
 		0xbb, 0x77, 0xba, 0xe4, 0x12, 0xbb, 0xf4, 0xc8,
 		0x5e, 0x9c, 0x81, 0xa8, 0x97, 0x60, 0x4c, 0x16,
 		0x03, 0x01, 0x00, 0x8b, 0x0c, 0x00, 0x00, 0x87,
-		0x03, 0x00, 0x17, 0x41, 0x04, 0x0b, 0xe5, 0x39,
-		0xde, 0x17, 0x7a, 0xaf, 0x96, 0xd5, 0x16, 0x01,
-		0xa8, 0x06, 0x80, 0x98, 0x75, 0x52, 0x56, 0x92,
-		0x15, 0xf9, 0x8d, 0xc0, 0x98, 0x62, 0xed, 0x54,
-		0xb7, 0xef, 0x03, 0x11, 0x34, 0x82, 0x65, 0xd1,
-		0xde, 0x25, 0x15, 0x4c, 0xf3, 0xdf, 0x4d, 0xbd,
-		0x6c, 0xed, 0x3d, 0xd6, 0x04, 0xcc, 0xd1, 0xf7,
-		0x6d, 0x32, 0xb1, 0x1c, 0x59, 0xca, 0xfb, 0xbc,
-		0x61, 0xeb, 0x4b, 0xe6, 0x00, 0x00, 0x40, 0x3e,
-		0xe6, 0x23, 0x54, 0x61, 0x3f, 0x63, 0x16, 0xeb,
-		0x5c, 0xc3, 0xba, 0x8a, 0x19, 0x13, 0x60, 0x9f,
-		0x23, 0xbf, 0x36, 0x1a, 0x32, 0x7a, 0xae, 0x34,
-		0x7f, 0x2f, 0x89, 0x85, 0xe1, 0x0e, 0x93, 0xd7,
-		0xf0, 0xab, 0xa1, 0x0d, 0x54, 0x95, 0x79, 0x0b,
-		0xb4, 0xf1, 0x1c, 0x1d, 0x0f, 0x8c, 0x16, 0xec,
-		0x82, 0x60, 0xee, 0xa3, 0x71, 0x2f, 0xaf, 0x3e,
-		0xf1, 0xbd, 0xb5, 0x1b, 0x7f, 0xe0, 0xd2, 0x16,
+		0x03, 0x00, 0x17, 0x41, 0x04, 0xec, 0x06, 0x1f,
+		0xa0, 0x5e, 0x29, 0x49, 0x71, 0x8b, 0x04, 0x9f,
+		0x47, 0x87, 0xb1, 0xcb, 0xae, 0x57, 0x8f, 0xd7,
+		0xf6, 0xf8, 0x59, 0x74, 0x64, 0x5d, 0x3a, 0x08,
+		0xaf, 0x20, 0xc6, 0xd9, 0xfc, 0x5e, 0x36, 0x8b,
+		0x62, 0x0e, 0xdb, 0xee, 0xd8, 0xcd, 0xef, 0x25,
+		0x8a, 0x38, 0x88, 0x2d, 0x5c, 0x71, 0x50, 0x22,
+		0xda, 0x3f, 0x94, 0x06, 0xc9, 0x68, 0x5b, 0x78,
+		0x3d, 0x95, 0xca, 0x54, 0x44, 0x00, 0x40, 0x36,
+		0xcf, 0x10, 0x81, 0xb4, 0x32, 0x45, 0x3c, 0xa5,
+		0x2d, 0x3e, 0xb0, 0xf8, 0xf4, 0x51, 0xf5, 0x28,
+		0x09, 0x85, 0x71, 0xa6, 0x79, 0x71, 0x4b, 0x4e,
+		0xda, 0x32, 0x5a, 0xc7, 0xb3, 0x57, 0xfd, 0xe8,
+		0x12, 0xab, 0xd8, 0x29, 0xfb, 0x8b, 0x43, 0x8f,
+		0x7e, 0x27, 0x63, 0x91, 0x84, 0x9c, 0x51, 0x0c,
+		0x26, 0x7e, 0x36, 0x3b, 0x37, 0x8d, 0x8f, 0x9e,
+		0xe2, 0x82, 0x62, 0xbb, 0xe5, 0xdf, 0xfc, 0x16,
 		0x03, 0x01, 0x00, 0x04, 0x0e, 0x00, 0x00, 0x00,
 	},
 	{
@@ -359,34 +359,34 @@ var ecdheAESClientScript = [][]byte{
 		0xe2, 0x32, 0x42, 0xe9, 0x58, 0xb6, 0xd7, 0x49,
 		0xa6, 0xb5, 0x68, 0x1a, 0x41, 0x03, 0x56, 0x6b,
 		0xdc, 0x5a, 0x89, 0x14, 0x03, 0x01, 0x00, 0x01,
-		0x01, 0x16, 0x03, 0x01, 0x00, 0x30, 0x09, 0xac,
-		0xbe, 0x94, 0x75, 0x4d, 0x73, 0x45, 0xbd, 0xa8,
-		0x0c, 0xe3, 0x5f, 0x72, 0x0b, 0x40, 0x4f, 0xd0,
-		0xd2, 0xcb, 0x16, 0x50, 0xfe, 0xdd, 0x1a, 0x33,
-		0x5c, 0x18, 0x37, 0x98, 0x42, 0xfc, 0x25, 0x42,
-		0x33, 0xce, 0x60, 0xcf, 0x8e, 0x95, 0x6e, 0x48,
-		0xed, 0x00, 0x35, 0x50, 0x26, 0x7f,
+		0x01, 0x16, 0x03, 0x01, 0x00, 0x30, 0x9a, 0xaa,
+		0xca, 0x5b, 0x57, 0xae, 0x34, 0x92, 0x80, 0x45,
+		0x7f, 0xe6, 0xf9, 0x09, 0x19, 0xd0, 0xf0, 0x1e,
+		0x4b, 0xc3, 0xda, 0x71, 0xce, 0x34, 0x33, 0x56,
+		0x9f, 0x20, 0x9f, 0xf9, 0xa8, 0x62, 0x6c, 0x38,
+		0x1b, 0x41, 0xf5, 0x54, 0xf2, 0x79, 0x42, 0x6c,
+		0xb5, 0x0e, 0xe7, 0xe1, 0xbc, 0x54,
 	},
 	{
 		0x14, 0x03, 0x01, 0x00, 0x01, 0x01, 0x16, 0x03,
-		0x01, 0x00, 0x30, 0xf6, 0x6a, 0xdb, 0x83, 0xd4,
-		0x3c, 0x77, 0x52, 0xad, 0xc0, 0x0f, 0x3a, 0x2c,
-		0x42, 0xb9, 0x60, 0x4b, 0xb2, 0xf6, 0x84, 0xfd,
-		0x4e, 0x96, 0xfc, 0x15, 0xe7, 0x94, 0x25, 0xb0,
-		0x59, 0x9f, 0xdd, 0xb6, 0x58, 0x03, 0x13, 0x8d,
-		0xeb, 0xb0, 0xad, 0x30, 0x31, 0x58, 0x6c, 0xa0,
-		0x8f, 0x57, 0x50,
+		0x01, 0x00, 0x30, 0x62, 0x82, 0x41, 0x75, 0x2b,
+		0xee, 0x0f, 0xdc, 0x6c, 0x48, 0x5a, 0x63, 0xd6,
+		0xcb, 0x0a, 0xfd, 0x0a, 0x0e, 0xde, 0x8b, 0x41,
+		0x19, 0x0c, 0x13, 0x6b, 0x12, 0xd1, 0xc2, 0x53,
+		0xeb, 0x1e, 0xf3, 0x7a, 0xbf, 0x23, 0xc5, 0xa6,
+		0x81, 0xa1, 0xdb, 0xab, 0x2f, 0x2c, 0xbc, 0x35,
+		0x96, 0x72, 0x83,
 	},
 	{
-		0x17, 0x03, 0x01, 0x00, 0x20, 0xab, 0x64, 0x3d,
-		0x79, 0x69, 0x3e, 0xba, 0xc4, 0x24, 0x7b, 0xe5,
-		0xe5, 0x23, 0x66, 0x6f, 0x32, 0xdf, 0x50, 0x7c,
-		0x06, 0x2a, 0x02, 0x82, 0x79, 0x40, 0xdb, 0xb1,
-		0x04, 0xc0, 0x2b, 0xdc, 0x3a, 0x15, 0x03, 0x01,
-		0x00, 0x20, 0xf8, 0xad, 0xca, 0xd7, 0x96, 0xf0,
-		0xd6, 0xa3, 0x62, 0xe1, 0x03, 0x44, 0xdb, 0xd0,
-		0xc9, 0x63, 0x3e, 0x1b, 0x70, 0x41, 0x57, 0x0c,
-		0xd8, 0x8e, 0x71, 0x49, 0x68, 0xe3, 0x04, 0x53,
-		0x5a, 0xbe,
+		0x17, 0x03, 0x01, 0x00, 0x20, 0xaf, 0x5d, 0x35,
+		0x57, 0x10, 0x60, 0xb3, 0x25, 0x7c, 0x26, 0x0f,
+		0xf3, 0x5e, 0xb3, 0x0d, 0xad, 0x14, 0x53, 0xcc,
+		0x0c, 0x08, 0xd9, 0xa2, 0x67, 0xab, 0xf4, 0x03,
+		0x17, 0x20, 0xf1, 0x7e, 0xca, 0x15, 0x03, 0x01,
+		0x00, 0x20, 0x30, 0xd0, 0xc1, 0xfb, 0x5f, 0xa6,
+		0x1b, 0xb4, 0x48, 0xc2, 0x0b, 0x98, 0xa8, 0x88,
+		0x7a, 0xba, 0xdf, 0x36, 0x06, 0xd8, 0xcc, 0xe9,
+		0x34, 0xdd, 0x64, 0xc8, 0x73, 0xc5, 0xa2, 0x34,
+		0x64, 0xb7,
 	},
 }