qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-25 02:57:57 -07:00
Code Releases Activity

exp/ssh: fix three shift bugs related to packet lengths

Browse Source 
Thanks for Ke Lan for the initial report and investigation.

R=agl, gustav.paul, tg8866, rsc
CC=golang-dev
https://golang.org/cl/5443044
This commit is contained in:
Dave Cheney 2011-11-28 12:10:16 -05:00 committed by Russ Cox
parent ffa6b383f5
commit ce7e11997b
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pkg/exp/ssh/channel.go
View File

@ -244,13 +244,13 @@ func (c *channel) Write(data []byte) (n int, err error) {
packet := make([]byte, 1+4+4+len(todo)) packet := make([]byte, 1+4+4+len(todo))
packet[0] = msgChannelData packet[0] = msgChannelData
packet[1] = byte(c.theirId) >> 24 packet[1] = byte(c.theirId >> 24)
packet[2] = byte(c.theirId) >> 16 packet[2] = byte(c.theirId >> 16)
packet[3] = byte(c.theirId) >> 8 packet[3] = byte(c.theirId >> 8)
packet[4] = byte(c.theirId) packet[4] = byte(c.theirId)
packet[5] = byte(len(todo)) >> 24 packet[5] = byte(len(todo) >> 24)
packet[6] = byte(len(todo)) >> 16 packet[6] = byte(len(todo) >> 16)
packet[7] = byte(len(todo)) >> 8 packet[7] = byte(len(todo) >> 8)
packet[8] = byte(len(todo)) packet[8] = byte(len(todo))
copy(packet[9:], todo) copy(packet[9:], todo)

4
src/pkg/exp/ssh/client.go
View File

@ -403,8 +403,8 @@ func (w *chanWriter) Write(data []byte) (n int, err error) {
n = len(data) n = len(data)
packet := make([]byte, 0, 9+n) packet := make([]byte, 0, 9+n)
packet = append(packet, msgChannelData, packet = append(packet, msgChannelData,
byte(w.peersId)>>24, byte(w.peersId)>>16, byte(w.peersId)>>8, byte(w.peersId), byte(w.peersId>>24), byte(w.peersId>>16), byte(w.peersId>>8), byte(w.peersId),
byte(n)>>24, byte(n)>>16, byte(n)>>8, byte(n)) byte(n>>24), byte(n>>16), byte(n>>8), byte(n))
err = w.writePacket(append(packet, data...)) err = w.writePacket(append(packet, data...))
w.rwin -= n w.rwin -= n
return return