ssh: automatically add curve25519-sha256@libssh.org KEX alias

If the key exchange method curve25519-sha256 is configured, automatically
add the curve25519-sha256@libssh.org alias to ensure compatibility with
OpenSSH versions up to 7.2, which recognize only the older vendor-specific
name.

Change-Id: If50ab2c49179db949ba1b986f7bb0e153cc7f897
Reviewed-on: https://go-review.googlesource.com/c/crypto/+/669716
Auto-Submit: Nicola Murino <nicola.murino@gmail.com>
Reviewed-by: Cherry Mui <cherryyz@google.com>
Reviewed-by: Carlos Amedee <carlos@golang.org>
Reviewed-by: Filippo Valsorda <filippo@golang.org>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
This commit is contained in:
Nicola Murino
2025-05-15 10:43:39 -07:00
committed by Gopher Robot
parent ac58737d25
commit 78a1fd7893
3 changed files with 518 additions and 515 deletions
+6 -3
View File
@@ -60,7 +60,9 @@ const (
// KeyExchangeMLKEM768X25519 is supported from Go 1.24.
KeyExchangeMLKEM768X25519 = "mlkem768x25519-sha256"
// An alias for KeyExchangeCurve25519SHA256.
// An alias for KeyExchangeCurve25519SHA256. This kex ID will be added if
// KeyExchangeCurve25519SHA256 is requested for backward compatibility with
// OpenSSH versions up to 7.2.
keyExchangeCurve25519LibSSH = "curve25519-sha256@libssh.org"
)
@@ -82,7 +84,6 @@ var (
// package in preference order, excluding those with security issues.
supportedKexAlgos = []string{
KeyExchangeCurve25519,
keyExchangeCurve25519LibSSH,
KeyExchangeECDHP256,
KeyExchangeECDHP384,
KeyExchangeECDHP521,
@@ -94,7 +95,6 @@ var (
// algorithms in preference order.
defaultKexAlgos = []string{
KeyExchangeCurve25519,
keyExchangeCurve25519LibSSH,
KeyExchangeECDHP256,
KeyExchangeECDHP384,
KeyExchangeECDHP521,
@@ -493,6 +493,9 @@ func (c *Config) SetDefaults() {
if kexAlgoMap[k] != nil {
// Ignore the KEX if we have no kexAlgoMap definition.
kexs = append(kexs, k)
if k == KeyExchangeCurve25519 && !contains(c.KeyExchanges, keyExchangeCurve25519LibSSH) {
kexs = append(kexs, keyExchangeCurve25519LibSSH)
}
}
}
c.KeyExchanges = kexs