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

crypto/tls: Fix c.in.decrypt error handling.

Browse Source 
readRecord was not returning early if c.in.decrypt failed and ran
through the rest of the function. It does set c.in.err, so the various
checks in the callers do ultimately notice before acting on the result,
but we should avoid running the rest of the function at all.

Also rename 'err' to 'alertValue' since it isn't actually an error.

Change-Id: I6660924716a85af704bd3fe81521b34766238695
Reviewed-on: https://go-review.googlesource.com/24709
Run-TryBot: Adam Langley <agl@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Adam Langley <agl@golang.org>
This commit is contained in:
David Benjamin 2016-07-01 16:41:09 -04:00 committed by Adam Langley
parent b7ba182f28
commit 5716364b9c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
conn.go
View File

@ -632,9 +632,10 @@ Again:
// Process message. // Process message.
b, c.rawInput = c.in.splitBlock(b, recordHeaderLen+n) b, c.rawInput = c.in.splitBlock(b, recordHeaderLen+n)
ok, off, err := c.in.decrypt(b) ok, off, alertValue := c.in.decrypt(b)
if !ok { if !ok {
c.in.setErrorLocked(c.sendAlert(err)) c.in.freeBlock(b)
return c.in.setErrorLocked(c.sendAlert(alertValue))
} }
b.off = off b.off = off
data := b.data[b.off:] data := b.data[b.off:]