From 0d2316b26734542fda0a2df69f586b811740edf4 Mon Sep 17 00:00:00 2001 From: Nicola Murino Date: Sun, 18 Feb 2024 15:50:20 +0100 Subject: [PATCH 1/2] ssh/test: work around for TestCiphers failures on macOS TestCiphers is already skipped on macOS when testing data received from the server, so move the test for sending data after the receiving one to work around this new integration test failure. Fixes golang/go#65732 Change-Id: Ie0c614c5373735ae8aefdd7ded643579b130f4b3 Reviewed-on: https://go-review.googlesource.com/c/crypto/+/564457 Reviewed-by: Bryan Mills Reviewed-by: Carlos Amedee LUCI-TryBot-Result: Go LUCI Auto-Submit: Nicola Murino Commit-Queue: Nicola Murino --- ssh/test/session_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ssh/test/session_test.go b/ssh/test/session_test.go index 7925e95278..e9bfa9ec27 100644 --- a/ssh/test/session_test.go +++ b/ssh/test/session_test.go @@ -357,11 +357,6 @@ func testOneCipher(t *testing.T, cipher string, cipherOrder []string) { numBytes := 4096 - // Exercise sending data to the server - if _, _, err := conn.Conn.SendRequest("drop-me", false, make([]byte, numBytes)); err != nil { - t.Fatalf("SendRequest: %v", err) - } - // Exercise receiving data from the server session, err := conn.NewSession() if err != nil { @@ -377,6 +372,11 @@ func testOneCipher(t *testing.T, cipher string, cipherOrder []string) { if len(out) != numBytes { t.Fatalf("got %d bytes, want %d bytes", len(out), numBytes) } + + // Exercise sending data to the server + if _, _, err := conn.Conn.SendRequest("drop-me", false, make([]byte, numBytes)); err != nil { + t.Fatalf("SendRequest: %v", err) + } } var deprecatedCiphers = []string{ From 7067223927c4e3f3bb91a5c6e0d2aae83df74e7a Mon Sep 17 00:00:00 2001 From: Gopher Robot Date: Mon, 4 Mar 2024 17:42:56 +0000 Subject: [PATCH 2/2] go.mod: update golang.org/x dependencies Update golang.org/x dependencies to their latest tagged versions. Change-Id: I54256afe881714f60fc37c471cd65b060090d9d6 Reviewed-on: https://go-review.googlesource.com/c/crypto/+/568816 Reviewed-by: Than McIntosh Reviewed-by: Michael Knyszek LUCI-TryBot-Result: Go LUCI Auto-Submit: Gopher Robot --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 5954e5dbec..9dee0fe087 100644 --- a/go.mod +++ b/go.mod @@ -4,8 +4,8 @@ go 1.18 require ( golang.org/x/net v0.21.0 // tagx:ignore - golang.org/x/sys v0.17.0 - golang.org/x/term v0.17.0 + golang.org/x/sys v0.18.0 + golang.org/x/term v0.18.0 ) require golang.org/x/text v0.14.0 // indirect diff --git a/go.sum b/go.sum index 70b680b428..e8784c3e2e 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,8 @@ golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= -golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.17.0 h1:mkTF7LCd6WGJNL3K1Ad7kwxNfYAW6a8a8QqtMblp/4U= -golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= +golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=