mirror of
https://github.com/golang/go.git
synced 2025-10-19 19:13:18 +00:00
crypto/tls: use illegal param alert for bad compression
Previously if the clientHandshakeState for the TLS 1.2 client code encountered a server helo message that contained a compression method other than compressionNone, we would emit an unexpected message alert. Instead, it seems more appropriate to return an illegal parameter alert. The server hello message _was_ expected, it just contained a bad parameter option. Making this change also allows enabling the InvalidCompressionMethod bogo test. Updates #72006 Change-Id: I27a2cd231e4b8762b0d9e2dbd3d8ddd5b87fd5c3 Reviewed-on: https://go-review.googlesource.com/c/go/+/669155 Reviewed-by: Roland Shoemaker <roland@golang.org> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Cherry Mui <cherryyz@google.com>
This commit is contained in:
parent
2f2f8fe2e8
commit
d382f14679
2 changed files with 1 additions and 2 deletions
|
@ -65,7 +65,6 @@
|
||||||
"NoNullCompression-TLS12": "TODO: first pass, this should be fixed",
|
"NoNullCompression-TLS12": "TODO: first pass, this should be fixed",
|
||||||
"KeyUpdate-RequestACK": "TODO: first pass, this should be fixed",
|
"KeyUpdate-RequestACK": "TODO: first pass, this should be fixed",
|
||||||
"TLS13-HRR-InvalidCompressionMethod": "TODO: first pass, this should be fixed",
|
"TLS13-HRR-InvalidCompressionMethod": "TODO: first pass, this should be fixed",
|
||||||
"InvalidCompressionMethod": "TODO: first pass, this should be fixed",
|
|
||||||
"TLS-TLS12-RSA_WITH_AES_128_GCM_SHA256-LargeRecord": "TODO: first pass, this should be fixed",
|
"TLS-TLS12-RSA_WITH_AES_128_GCM_SHA256-LargeRecord": "TODO: first pass, this should be fixed",
|
||||||
"TLS-TLS1-RSA_WITH_AES_128_CBC_SHA-LargeRecord": "TODO: first pass, this should be fixed",
|
"TLS-TLS1-RSA_WITH_AES_128_CBC_SHA-LargeRecord": "TODO: first pass, this should be fixed",
|
||||||
"TLS-TLS11-RSA_WITH_AES_128_CBC_SHA-LargeRecord": "TODO: first pass, this should be fixed",
|
"TLS-TLS11-RSA_WITH_AES_128_CBC_SHA-LargeRecord": "TODO: first pass, this should be fixed",
|
||||||
|
|
|
@ -889,7 +889,7 @@ func (hs *clientHandshakeState) processServerHello() (bool, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if hs.serverHello.compressionMethod != compressionNone {
|
if hs.serverHello.compressionMethod != compressionNone {
|
||||||
c.sendAlert(alertUnexpectedMessage)
|
c.sendAlert(alertIllegalParameter)
|
||||||
return false, errors.New("tls: server selected unsupported compression format")
|
return false, errors.New("tls: server selected unsupported compression format")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue