commit 36a967d3212260ed1abea70bb749e710e26457a3
author Daniel Theophanes <kardianos@gmail.com> Tue Mar 06 11:25:32 2012 -0500
committer Adam Langley <agl@golang.org> Tue Mar 06 11:25:32 2012 -0500
tree 4e4146b38009fb46b2ba798023b874c306858b90
parent 79d53bd55e9f84a8565f28a40137f5a1d07ba5ec

go.crypto/ssh: add support for diffie-hellman-group1-sha1.

Fixes golang/go#2903.

R=golang-dev
CC=agl, golang-dev
https://golang.org/cl/5755054

ssh/client.go

diff --git a/ssh/client.go b/ssh/client.go
index 43f8647..ab5d96a 100644
--- a/ssh/client.go
+++ b/ssh/client.go
@@ -105,6 +105,10 @@
 		hashFunc = crypto.SHA1
 		dhGroup14Once.Do(initDHGroup14)
 		H, K, err = c.kexDH(dhGroup14, hashFunc, &magics, hostKeyAlgo)
+	case keyAlgoDH1SHA1:
+		hashFunc = crypto.SHA1
+		dhGroup1Once.Do(initDHGroup1)
+		H, K, err = c.kexDH(dhGroup1, hashFunc, &magics, hostKeyAlgo)
 	default:
 		err = fmt.Errorf("ssh: unexpected key exchange algorithm %v", kexAlgo)
 	}

ssh/common.go

diff --git a/ssh/common.go b/ssh/common.go
index 3368c3c..429b488 100644
--- a/ssh/common.go
+++ b/ssh/common.go
@@ -14,6 +14,7 @@
 
 // These are string constants in the SSH protocol.
 const (
+	keyAlgoDH1SHA1  = "diffie-hellman-group1-sha1"
 	kexAlgoDH14SHA1 = "diffie-hellman-group14-sha1"
 	hostAlgoRSA     = "ssh-rsa"
 	hostAlgoDSA     = "ssh-dss"
@@ -22,7 +23,7 @@
 	serviceSSH      = "ssh-connection"
 )
 
-var supportedKexAlgos = []string{kexAlgoDH14SHA1}
+var supportedKexAlgos = []string{kexAlgoDH14SHA1, keyAlgoDH1SHA1}
 var supportedHostKeyAlgos = []string{hostAlgoRSA}
 var supportedCompressions = []string{compressionNone}
 
@@ -31,6 +32,21 @@
 	g, p *big.Int
 }
 
+// dhGroup1 is the group called diffie-hellman-group1-sha1 in RFC 4253 and
+// Oakley Group 2 in RFC 2409.
+var dhGroup1 *dhGroup
+
+var dhGroup1Once sync.Once
+
+func initDHGroup1() {
+	p, _ := new(big.Int).SetString("FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE649286651ECE65381FFFFFFFFFFFFFFFF", 16)
+
+	dhGroup1 = &dhGroup{
+		g: new(big.Int).SetInt64(2),
+		p: p,
+	}
+}
+
 // dhGroup14 is the group called diffie-hellman-group14-sha1 in RFC 4253 and
 // Oakley Group 14 in RFC 3526.
 var dhGroup14 *dhGroup

ssh/server.go

diff --git a/ssh/server.go b/ssh/server.go
index 7c2ee23..9cefda0 100644
--- a/ssh/server.go
+++ b/ssh/server.go
@@ -272,6 +272,10 @@
 		hashFunc = crypto.SHA1
 		dhGroup14Once.Do(initDHGroup14)
 		H, K, err = s.kexDH(dhGroup14, hashFunc, &magics, hostKeyAlgo)
+	case keyAlgoDH1SHA1:
+		hashFunc = crypto.SHA1
+		dhGroup1Once.Do(initDHGroup1)
+		H, K, err = s.kexDH(dhGroup1, hashFunc, &magics, hostKeyAlgo)
 	default:
 		err = errors.New("ssh: unexpected key exchange algorithm " + kexAlgo)
 	}