kris/th5
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

crypto/tls: fix parsing of SNI extension.

Browse Source 
The previous code had a brain fart: it took one of the length prefixes
as an element count, not a length. This didn't actually affect anything
because the loop stops as soon as it finds a hostname element, and the
hostname element is always the first and only element. (No other element
types have ever been defined.)

This change fixes the parsing in case SNI is ever changed in the future.

Fixes #10793.

Change-Id: Iafdf3381942bc22b1f33595315c53dc6cc2e9f0f
Reviewed-on: https://go-review.googlesource.com/11059
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
Adam Langley 2015-06-14 08:15:41 -07:00
parent 95ef689b2c
commit c757de320b
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
handshake_messages.go
View File

@ -367,12 +367,16 @@ func (m *clientHelloMsg) unmarshal(data []byte) bool {
switch extension { switch extension {
case extensionServerName: case extensionServerName:
if length < 2 { d := data[:length]
if len(d) < 2 {
return false return false
} }
numNames := int(data[0])<<8 | int(data[1]) namesLen := int(d[0])<<8 | int(d[1])
d := data[2:] d = d[2:]
for i := 0; i < numNames; i++ { if len(d) != namesLen {
return false
}
for len(d) > 0 {
if len(d) < 3 { if len(d) < 3 {
return false return false
} }
@ -383,7 +387,7 @@ func (m *clientHelloMsg) unmarshal(data []byte) bool {
return false return false
} }
if nameType == 0 { if nameType == 0 {
m.serverName = string(d[0:nameLen]) m.serverName = string(d[:nameLen])
break break
} }
d = d[nameLen:] d = d[nameLen:]