[dev.boringcrypto] all: merge master into dev.boringcrypto

[gostls13.git] / src / crypto / tls / handshake_messages_test.go

diff --git a/src/crypto/tls/handshake_messages_test.go b/src/crypto/tls/handshake_messages_test.go
index 1f08f6ac0e22435ce584c13a08486a8981626886..c54a0f864fe166ca08fcc02c721892e204c7fd5e 100644 (file)
--- a/src/crypto/tls/handshake_messages_test.go
+++ b/src/crypto/tls/handshake_messages_test.go
@@ -26,7 +26,6 @@ var tests = []interface{}{
        },
        &certificateStatusMsg{},
        &clientKeyExchangeMsg{},
-       &nextProtoMsg{},
        &newSessionTicketMsg{},
        &sessionState{},
        &sessionStateTLS13{},
@@ -127,9 +126,6 @@ func (*clientHelloMsg) Generate(rand *rand.Rand, size int) reflect.Value {
                m.cipherSuites[i] = cs
        }
        m.compressionMethods = randomBytes(rand.Intn(63)+1, rand)
-       if rand.Intn(10) > 5 {
-               m.nextProtoNeg = true
-       }
        if rand.Intn(10) > 5 {
                m.serverName = randomString(rand.Intn(255), rand)
                for strings.HasSuffix(m.serverName, ".") {
@@ -205,13 +201,7 @@ func (*serverHelloMsg) Generate(rand *rand.Rand, size int) reflect.Value {
        m.sessionId = randomBytes(rand.Intn(32), rand)
        m.cipherSuite = uint16(rand.Int31())
        m.compressionMethod = uint8(rand.Intn(256))
-
-       if rand.Intn(10) > 5 {
-               m.nextProtoNeg = true
-               for i := 0; i < rand.Intn(10); i++ {
-                       m.nextProtos = append(m.nextProtos, randomString(20, rand))
-               }
-       }
+       m.supportedPoints = randomBytes(rand.Intn(5)+1, rand)
 
        if rand.Intn(10) > 5 {
                m.ocspStapling = true
@@ -308,12 +298,6 @@ func (*finishedMsg) Generate(rand *rand.Rand, size int) reflect.Value {
        return reflect.ValueOf(m)
 }
 
-func (*nextProtoMsg) Generate(rand *rand.Rand, size int) reflect.Value {
-       m := &nextProtoMsg{}
-       m.proto = randomString(rand.Intn(255), rand)
-       return reflect.ValueOf(m)
-}
-
 func (*newSessionTicketMsg) Generate(rand *rand.Rand, size int) reflect.Value {
        m := &newSessionTicketMsg{}
        m.ticket = randomBytes(rand.Intn(4), rand)