Add support for "[email protected]"

Change-Id: I0203881afd7ad72e68f76650817451d7e292c91b GitHub-Last-Rev: 42b4119 GitHub-Pull-Request: #129 Reviewed-on: https://go-review.googlesource.com/c/crypto/+/226982 Run-TryBot: Han-Wen Nienhuys <[email protected]> Reviewed-by: Han-Wen Nienhuys <[email protected]> Auto-Submit: Han-Wen Nienhuys <[email protected]> Reviewed-by: David Chase <[email protected]> TryBot-Result: Gopher Robot <[email protected]>
golang · Jun 5, 2023 · 1622238 · 1622238
1 parent a4e9841
commit 1622238
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/ssh/common.go b/ssh/common.go
@@ -85,7 +85,7 @@ var supportedHostKeyAlgos = []string{
 // This is based on RFC 4253, section 6.4, but with hmac-md5 variants removed
 // because they have reached the end of their useful life.
 var supportedMACs = []string{
-	"[email protected]", "hmac-sha2-256", "hmac-sha1", "hmac-sha1-96",
+	"hmac-sha2-[email protected]", "hmac-sha2-[email protected]", "hmac-sha2-256", "hmac-sha1", "hmac-sha1-96",
 }
 
 var supportedCompressions = []string{compressionNone}

diff --git a/ssh/mac.go b/ssh/mac.go
@@ -10,6 +10,7 @@ import (
 	"crypto/hmac"
 	"crypto/sha1"
 	"crypto/sha256"
+	"crypto/sha512"
 	"hash"
 )
 
@@ -46,6 +47,9 @@ func (t truncatingMAC) Size() int {
 func (t truncatingMAC) BlockSize() int { return t.hmac.BlockSize() }
 
 var macModes = map[string]*macMode{
+	"[email protected]": {64, true, func(key []byte) hash.Hash {
+		return hmac.New(sha512.New, key)
+	}},
 	"[email protected]": {32, true, func(key []byte) hash.Hash {
 		return hmac.New(sha256.New, key)
 	}},