Makefile

@@ -1,4 +1,4 @@
-VERSION := 0.9.14
+VERSION := 0.9.12
 .PHONY: lint vis clean common client server passwd\
  subpkgs install uninstall reinstall scc
  

xs/xs.go

@@ -1034,8 +1034,7 @@ func main() { //nolint: funlen, gocyclo
 	// === Terminal mode adjustment for session
 
 	if shellMode {
-		if isatty.IsTerminal(os.Stdin.Fd()) ||
-			isatty.IsCygwinTerminal(os.Stdin.Fd()) {
+		if isatty.IsTerminal(os.Stdin.Fd()) {
 			oldState, err = xs.MakeRaw(os.Stdin)
 			if err != nil {
 				panic(err)
@@ -1079,6 +1078,10 @@ func main() { //nolint: funlen, gocyclo
 		fmt.Fprintln(os.Stderr, rejectUserMsg())
 		rec.SetStatus(GeneralProtocolErr)
 	} else {
+		// === Set up connection keepalive to server
+		conn.StartupKeepAlive() // goroutine, returns immediately
+		defer conn.ShutdownKeepAlive()
+
 		// === Set up chaffing to server
 		conn.SetupChaff(chaffFreqMin, chaffFreqMax, chaffBytesMax) // enable client->server chaffing
 		if chaffEnabled {
@@ -1109,10 +1112,6 @@ func main() { //nolint: funlen, gocyclo
 
 		// === Session entry (shellMode or copyMode)
 		if shellMode {
-			// === Set up connection keepalive to server
-			conn.StartupKeepAlive() // goroutine, returns immediately
-			defer conn.ShutdownKeepAlive()
-
 			// === (shell) launch tunnels
 			launchTuns(&conn /*remoteHost,*/, tunSpecStr)
 			doShellMode(isInteractive, &conn, oldState, rec)

xsd/xsd.go

@@ -121,6 +121,10 @@ func runClientToServerCopyAs(who, ttype string, conn *xsnet.Conn, fpath string,
 	c.Stdout = os.Stdout
 	c.Stderr = os.Stderr
 
+	// === Set up connection keepalive to client
+	conn.StartupKeepAlive() // goroutine, returns immediately
+	defer conn.ShutdownKeepAlive()
+
 	if chaffing {
 		conn.StartupChaff()
 	}
@@ -217,6 +221,10 @@ func runServerToClientCopyAs(who, ttype string, conn *xsnet.Conn, srcPath string
 	c.Stderr = stdErrBuffer
 	//c.Stderr = nil
 
+	// === Set up connection keepalive to client
+	conn.StartupKeepAlive() // goroutine, returns immediately
+	defer conn.ShutdownKeepAlive()
+
 	if chaffing {
 		conn.StartupChaff()
 	}
@@ -372,11 +380,11 @@ func runShellAs(who, hname, ttype, cmd string, interactive bool, //nolint:funlen
 
 		if chaffing {
 			conn.StartupChaff()
-			// #gv:s/label=\"runShellAs\$4\"/label=\"deferChaffShutdown\"/
-				defer func() {
-				conn.ShutdownChaff()
-			}()
 		}
+		// #gv:s/label=\"runShellAs\$4\"/label=\"deferChaffShutdown\"/
+		defer func() {
+			conn.ShutdownChaff()
+		}()
 
 		// ..and the pty to stdout.
 		// This may take some time exceeding that of the

xsnet/chan.go

@@ -22,11 +22,11 @@ import (
 
 	"blitter.com/go/cryptmt"
 	"blitter.com/go/hopscotch"
+	"blitter.com/go/xs/logger"
 	"github.com/aead/chacha20/chacha"
-	whirlpool "github.com/jzelinskie/whirlpool"
 	"golang.org/x/crypto/blowfish"
 	"golang.org/x/crypto/twofish"
-
+	whirlpool "github.com/jzelinskie/whirlpool"
 	// hash algos must be manually imported thusly:
 	// (Would be nice if the golang pkg docs were more clear
 	// on this...)
@@ -64,7 +64,8 @@ func getNewStreamAlgs(cb uint8, hb uint8) (config uint32) {
 	// the input rekeying data
 	c := (cb % CAlgNoneDisallowed)
 	h := (hb % HmacNoneDisallowed)
-	config = uint32(h)<<8 | uint32(c)
+	config = uint32(h<<8) | uint32(c)
+	logger.LogDebug(fmt.Sprintf("[Chose new algs [%d:%d]", h, c))
 	return
 }