crypto/tls: tests prefer constants to opaque literals

This is minor cleanup that makes the tests more readable.

Change-Id: I9f1f98f0f035096c284bdf3501e7520517a3e4d9
Reviewed-on: https://go-review.googlesource.com/19993
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>

diff --git a/src/crypto/tls/handshake_server_test.go b/src/crypto/tls/handshake_server_test.go
index 438fb3140a32cbb923204a8ef26d6f28b66c70a4..e25bfa5170049a058b2533ea8b4a57c92f6beb8d 100644 (file)
--- a/src/crypto/tls/handshake_server_test.go
+++ b/src/crypto/tls/handshake_server_test.go
@@ -105,16 +105,16 @@ func TestRejectBadProtocolVersion(t *testing.T) {
 
 func TestNoSuiteOverlap(t *testing.T) {
        clientHello := &clientHelloMsg{
-               vers:               0x0301,
+               vers:               VersionTLS10,
                cipherSuites:       []uint16{0xff00},
-               compressionMethods: []uint8{0},
+               compressionMethods: []uint8{compressionNone},
        }
        testClientHelloFailure(t, testConfig, clientHello, "no cipher suite supported by both client and server")
 }
 
 func TestNoCompressionOverlap(t *testing.T) {
        clientHello := &clientHelloMsg{
-               vers:               0x0301,
+               vers:               VersionTLS10,
                cipherSuites:       []uint16{TLS_RSA_WITH_RC4_128_SHA},
                compressionMethods: []uint8{0xff},
        }
@@ -123,9 +123,9 @@ func TestNoCompressionOverlap(t *testing.T) {
 
 func TestNoRC4ByDefault(t *testing.T) {
        clientHello := &clientHelloMsg{
-               vers:               0x0301,
+               vers:               VersionTLS10,
                cipherSuites:       []uint16{TLS_RSA_WITH_RC4_128_SHA},
-               compressionMethods: []uint8{0},
+               compressionMethods: []uint8{compressionNone},
        }
        serverConfig := *testConfig
        // Reset the enabled cipher suites to nil in order to test the
@@ -138,9 +138,9 @@ func TestDontSelectECDSAWithRSAKey(t *testing.T) {
        // Test that, even when both sides support an ECDSA cipher suite, it
        // won't be selected if the server's private key doesn't support it.
        clientHello := &clientHelloMsg{
-               vers:               0x0301,
+               vers:               VersionTLS10,
                cipherSuites:       []uint16{TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA},
-               compressionMethods: []uint8{0},
+               compressionMethods: []uint8{compressionNone},
                supportedCurves:    []CurveID{CurveP256},
                supportedPoints:    []uint8{pointFormatUncompressed},
        }
@@ -163,9 +163,9 @@ func TestDontSelectRSAWithECDSAKey(t *testing.T) {
        // Test that, even when both sides support an RSA cipher suite, it
        // won't be selected if the server's private key doesn't support it.
        clientHello := &clientHelloMsg{
-               vers:               0x0301,
+               vers:               VersionTLS10,
                cipherSuites:       []uint16{TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA},
-               compressionMethods: []uint8{0},
+               compressionMethods: []uint8{compressionNone},
                supportedCurves:    []CurveID{CurveP256},
                supportedPoints:    []uint8{pointFormatUncompressed},
        }
@@ -788,9 +788,9 @@ func TestHandshakeServerSNIGetCertificateError(t *testing.T) {
        }
 
        clientHello := &clientHelloMsg{
-               vers:               0x0301,
+               vers:               VersionTLS10,
                cipherSuites:       []uint16{TLS_RSA_WITH_RC4_128_SHA},
-               compressionMethods: []uint8{0},
+               compressionMethods: []uint8{compressionNone},
                serverName:         "test",
        }
        testClientHelloFailure(t, &serverConfig, clientHello, errMsg)
@@ -808,9 +808,9 @@ func TestHandshakeServerEmptyCertificates(t *testing.T) {
        serverConfig.Certificates = nil
 
        clientHello := &clientHelloMsg{
-               vers:               0x0301,
+               vers:               VersionTLS10,
                cipherSuites:       []uint16{TLS_RSA_WITH_RC4_128_SHA},
-               compressionMethods: []uint8{0},
+               compressionMethods: []uint8{compressionNone},
        }
        testClientHelloFailure(t, &serverConfig, clientHello, errMsg)
 
@@ -819,9 +819,9 @@ func TestHandshakeServerEmptyCertificates(t *testing.T) {
        serverConfig.GetCertificate = nil
 
        clientHello = &clientHelloMsg{
-               vers:               0x0301,
+               vers:               VersionTLS10,
                cipherSuites:       []uint16{TLS_RSA_WITH_RC4_128_SHA},
-               compressionMethods: []uint8{0},
+               compressionMethods: []uint8{compressionNone},
        }
        testClientHelloFailure(t, &serverConfig, clientHello, "no certificates")
 }