Change the maximm handshake length to 8192 bytes.

 * handhake_ntor_test now is considerably more comprehensive.
 * The padding related constants in the spec were clarified.

This breaks wireprotocol compatibility.

1 files changed, 3 insertions, 3 deletions

diff --git a/obfs4.go b/obfs4.go
index e9ba2e8..f32c222 100644
--- a/obfs4.go
+++ b/obfs4.go
@@ -48,7 +48,7 @@ const (
 	headerLength      = framing.FrameOverhead + packetOverhead
 	connectionTimeout = time.Duration(30) * time.Second
 
-	maxCloseDelayBytes = framing.MaximumSegmentLength * 5
+	maxCloseDelayBytes = maxHandshakeLength
 	maxCloseDelay      = 60
 )
 
@@ -181,7 +181,7 @@ func (c *Obfs4Conn) clientHandshake(nodeID *ntor.NodeID, publicKey *ntor.PublicK
 	}
 
 	// Consume the server handshake.
-	var hsBuf [serverMaxHandshakeLength]byte
+	var hsBuf [maxHandshakeLength]byte
 	for {
 		var n int
 		n, err = c.conn.Read(hsBuf[:])
@@ -235,7 +235,7 @@ func (c *Obfs4Conn) serverHandshake(nodeID *ntor.NodeID, keypair *ntor.Keypair)
 	}
 
 	// Consume the client handshake.
-	var hsBuf [clientMaxHandshakeLength]byte
+	var hsBuf [maxHandshakeLength]byte
 	for {
 		var n int
 		n, err = c.conn.Read(hsBuf[:])