summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2016-04-08 08:35:54 +0200
committerDamien Miller <djm@mindrot.org>2016-04-08 09:36:29 +0200
commit90ee563fa6b54c59896c6c332c5188f866c5e75f (patch)
treee30f408abc3b50bf8ed32691d7ab675957591b6a
parentupstream commit (diff)
downloadopenssh-90ee563fa6b54c59896c6c332c5188f866c5e75f.tar.xz
openssh-90ee563fa6b54c59896c6c332c5188f866c5e75f.zip
upstream commit
We accidentally send an empty string and a zero uint32 with every direct-streamlocal@openssh.com channel open, in contravention of our own spec. Fixing this is too hard wrt existing versions that expect these fields to be present and fatal() if they aren't, so document them as "reserved" fields in the PROTOCOL spec as though we always intended this and let us never speak of it again. bz#2529, reported by Ron Frederick Upstream-ID: 34cd326a4d236ca6e39084c4ff796bd97ab833e7
-rw-r--r--PROTOCOL4
1 files changed, 3 insertions, 1 deletions
diff --git a/PROTOCOL b/PROTOCOL
index 131adfefe..c6f99a31a 100644
--- a/PROTOCOL
+++ b/PROTOCOL
@@ -247,6 +247,8 @@ to request that the server make a connection to a Unix domain socket.
uint32 initial window size
uint32 maximum packet size
string socket path
+ string reserved
+ uint32 reserved
Similar to forwarded-tcpip, forwarded-streamlocal is sent by the
server when the client has previously send the server a streamlocal-forward
@@ -452,4 +454,4 @@ respond with a SSH_FXP_STATUS message.
This extension is advertised in the SSH_FXP_VERSION hello with version
"1".
-$OpenBSD: PROTOCOL,v 1.29 2015/07/17 03:09:19 djm Exp $
+$OpenBSD: PROTOCOL,v 1.30 2016/04/08 06:35:54 djm Exp $