Skip to content

Commit 8819902

Browse files
drakkangopherbot
authored andcommitted
ssh/test: enable Diffie-Hellman key exchange algorithms
starting with OpenSSH 10, all Diffie-Hellman key exchange algorithms are disabled by default. To generate recordings, we must explicitly enable them. Change-Id: Icfbf46b30478f36d7040991e0f6324b9b4766aaf Reviewed-on: https://go-review.googlesource.com/c/crypto/+/665115 Reviewed-by: Filippo Valsorda <filippo@golang.org> Auto-Submit: Nicola Murino <nicola.murino@gmail.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Dmitri Shuralyov <dmitshur@google.com> Reviewed-by: Michael Pratt <mpratt@google.com>
1 parent 3f311e4 commit 8819902

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

ssh/test/recording_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ IgnoreRhosts yes
5050
RhostsRSAAuthentication no
5151
HostbasedAuthentication no
5252
PubkeyAcceptedKeyTypes=*
53-
# In recent OpenSSH versions, the 'diffie-hellman-group14-sha1'
54-
# algorithm is disabled by default. However, it remains part of
55-
# our default Key Exchange (KEX) configuration, so we explicitly
56-
# enable it to ensure compatibility for testing.
57-
KexAlgorithms +diffie-hellman-group14-sha1
53+
# In recent versions of OpenSSH, Diffie-Hellman key exchange algorithms
54+
# are disabled by default. However, they are still included in our default
55+
# Key Exchange (KEX) configuration. We explicitly enable them here to
56+
# maintain compatibility for our test cases.
57+
KexAlgorithms +diffie-hellman-group14-sha1,diffie-hellman-group14-sha256,diffie-hellman-group14-sha256,diffie-hellman-group16-sha512,diffie-hellman-group-exchange-sha256
5858
`
5959
multiAuthSshdConfigTail = `
6060
UsePAM yes

0 commit comments

Comments
 (0)