mirrors/XTLS_REALITY
0
0
Fork 0
mirror of https://github.com/XTLS/REALITY.git synced 2025-08-22 22:48:36 +00:00
Code

crypto/tls: add offered cipher suites to the handshake error

Browse Source 
This change makes debugging easier if the server handshake fails because
the client only offers unsupported algorithms.

Change-Id: I7daac173a16af2e073aec3d9b59709560f540c6f
Reviewed-on: https://go-review.googlesource.com/c/go/+/631555
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Filippo Valsorda <filippo@golang.org>
Reviewed-by: Roland Shoemaker <roland@golang.org>
Auto-Submit: Nicola Murino <nicola.murino@gmail.com>
This commit is contained in:
yuhan6665 2025-05-10 23:33:34 -04:00
parent 5052e9a93c
commit 5b2edd4705
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
handshake_server.go
View File

@ -374,7 +374,8 @@ func (hs *serverHandshakeState) pickCipherSuite() error {
hs.suite = selectCipherSuite(preferenceList, hs.clientHello.cipherSuites, hs.cipherSuiteOk) hs.suite = selectCipherSuite(preferenceList, hs.clientHello.cipherSuites, hs.cipherSuiteOk)
if hs.suite == nil { if hs.suite == nil {
c.sendAlert(alertHandshakeFailure) c.sendAlert(alertHandshakeFailure)
return errors.New("tls: no cipher suite supported by both client and server") return fmt.Errorf("tls: no cipher suite supported by both client and server; client offered: %x",
hs.clientHello.cipherSuites)
} }
c.cipherSuite = hs.suite.id c.cipherSuite = hs.suite.id

4
handshake_server_tls13.go
View File

@ -18,6 +18,7 @@ import (
"crypto/x509" "crypto/x509"
"encoding/binary" "encoding/binary"
"errors" "errors"
"fmt"
"hash" "hash"
"io" "io"
"math/big" "math/big"
@ -243,7 +244,8 @@ func (hs *serverHandshakeStateTLS13) processClientHello() error {
} }
if hs.suite == nil { if hs.suite == nil {
c.sendAlert(alertHandshakeFailure) c.sendAlert(alertHandshakeFailure)
return errors.New("tls: no cipher suite supported by both client and server") return fmt.Errorf("tls: no cipher suite supported by both client and server; client offered: %x",
hs.clientHello.cipherSuites)
} }
c.cipherSuite = hs.suite.id c.cipherSuite = hs.suite.id
hs.hello.cipherSuite = hs.suite.id hs.hello.cipherSuite = hs.suite.id