Skip to content

fix(v3): fix strict mode TLS 1.3 detection bug #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
36huo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(v3): fix strict mode TLS 1.3 detection bug #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion v3_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func (w *streamWrapper) Read(p []byte) (n int, err error) {
w.readHMAC = hmac.New(sha1.New, []byte(w.password))
w.readHMAC.Write(w.serverRandom)
w.readHMACKey = kdf(w.password, w.serverRandom)
w.isTLS13 = isServerHelloSupportTLS13(buffer[5:])
w.isTLS13 = isServerHelloSupportTLS13(buffer)
if !w.isTLS13 {
w.authorized = true
}
Expand Down
6 changes: 5 additions & 1 deletion v3_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,10 @@ func isServerHelloSupportTLS13(frame []byte) bool {
if err != nil {
return false
}
for i := uint16(0); i < extensionListLength; i++ {
// extensionListLength is the total byte length of all extensions,
// NOT the number of extensions. Iterate by bytes consumed.
extensionsRead := uint16(0)
for extensionsRead < extensionListLength {
var extensionType uint16
err = binary.Read(reader, binary.BigEndian, &extensionType)
if err != nil {
Expand All @@ -121,6 +124,7 @@ func isServerHelloSupportTLS13(frame []byte) bool {
if err != nil {
return false
}
extensionsRead += 4 + extensionLength
if extensionType != 43 {
_, err = io.CopyN(io.Discard, reader, int64(extensionLength))
if err != nil {
Expand Down