From ee3d6a30834d463dd094f3e372d648e516c866a1 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 13 Apr 2017 09:47:15 +0200 Subject: [PATCH] ssh: fix reset{Read,Write}Thresholds for initial setup Fixes a nil pointer dereference that slipped through buildbots because it was introduced by the last two commits. Change-Id: Ib269e910956cd8b3b46e217b03fde1b61572260a Reviewed-on: https://go-review.googlesource.com/40530 Reviewed-by: Han-Wen Nienhuys Run-TryBot: Han-Wen Nienhuys TryBot-Result: Gobot Gobot --- ssh/handshake.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ssh/handshake.go b/ssh/handshake.go index 85b4013..932ce83 100644 --- a/ssh/handshake.go +++ b/ssh/handshake.go @@ -245,6 +245,8 @@ func (t *handshakeTransport) resetWriteThresholds() { t.writeBytesLeft = int64(t.config.RekeyThreshold) } else if t.algorithms != nil { t.writeBytesLeft = t.algorithms.w.rekeyBytes() + } else { + t.writeBytesLeft = 1 << 30 } } @@ -355,8 +357,10 @@ func (t *handshakeTransport) resetReadThresholds() { t.readPacketsLeft = packetRekeyThreshold if t.config.RekeyThreshold > 0 { t.readBytesLeft = int64(t.config.RekeyThreshold) - } else { + } else if t.algorithms != nil { t.readBytesLeft = t.algorithms.r.rekeyBytes() + } else { + t.readBytesLeft = 1 << 30 } }