mirrors/utls
1
0
Fork 0
mirror of https://github.com/refraction-networking/utls.git synced 2025-04-04 20:47:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

🚑 fix: code broken after merging

Browse source 
Signed-off-by: Gaukas Wang <i@gaukas.wang>
This commit is contained in:
Gaukas Wang 2024-01-10 22:09:25 -07:00
parent 8680818a98
commit 5796f9738a
No known key found for this signature in database
GPG key ID: 6F0DF52D710D8189
6 changed files with 58 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

31
handshake_client.go
View file

@ -19,7 +19,6 @@ import (
"hash"
"io"
"net"
"strconv"
"strings"
"time"
@ -593,9 +592,12 @@ func (hs *clientHandshakeState) pickCipherSuite() error {
return errors.New("tls: server chose an unconfigured cipher suite")
}
if hs.c.config.CipherSuites == nil && rsaKexCiphers[hs.suite.id] {
tlsrsakex.IncNonDefault()
}
// [UTLS SECTION START]
// Disable unsupported godebug packages
// if hs.c.config.CipherSuites == nil && rsaKexCiphers[hs.suite.id] {
// tlsrsakex.IncNonDefault()
// }
// [UTLS SECTION END]
hs.c.cipherSuite = hs.suite.id
return nil
@ -1017,17 +1019,20 @@ func (hs *clientHandshakeState) sendFinished(out []byte) error {
// to verify the signatures of during a TLS handshake.
const defaultMaxRSAKeySize = 8192
var tlsmaxrsasize = godebug.New("tlsmaxrsasize")
// var tlsmaxrsasize = godebug.New("tlsmaxrsasize") // [uTLS] unused
func checkKeySize(n int) (max int, ok bool) {
if v := tlsmaxrsasize.Value(); v != "" {
if max, err := strconv.Atoi(v); err == nil {
if (n <= max) != (n <= defaultMaxRSAKeySize) {
tlsmaxrsasize.IncNonDefault()
}
return max, n <= max
}
}
// [uTLS SECTION START]
// Disable the unsupported godebug package
// if v := tlsmaxrsasize.Value(); v != "" {
// if max, err := strconv.Atoi(v); err == nil {
// if (n <= max) != (n <= defaultMaxRSAKeySize) {
// tlsmaxrsasize.IncNonDefault()
// }
// return max, n <= max
// }
// }
// [uTLS SECTION END]
return defaultMaxRSAKeySize, n <= defaultMaxRSAKeySize
}