Eliminate custom ssh.DefaultPubKeyAuthAlgos() interface

USTC-vlab · Aug 28, 2024 · d2b96c7 · d2b96c7
1 parent 1486234
commit d2b96c7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/crypto/ssh/pipe.go b/crypto/ssh/pipe.go
@@ -9,11 +9,6 @@ import (
 	"net"
 )
 
-// Helper functions to export variables from this module
-func DefaultPubKeyAuthAlgos() []string {
-	return supportedPubKeyAuthAlgos
-}
-
 type Downstream struct {
 	*connection
 }
@@ -45,6 +40,9 @@ type AuthResult struct {
 func NewPipeSession(c net.Conn, config *ServerConfig) (session *PipeSession, err error) {
 	serverConfig := *config
 	serverConfig.SetDefaults()
+	if len(serverConfig.PublicKeyAuthAlgorithms) == 0 {
+		serverConfig.PublicKeyAuthAlgorithms = supportedPubKeyAuthAlgos
+	}
 	conn := &connection{
 		sshConn: sshConn{conn: c},
 	}

diff --git a/sshmux.go b/sshmux.go
@@ -64,10 +64,7 @@ func validateKey(config SSHKeyConfig) (ssh.Signer, error) {
 }
 
 func makeServer(config Config) (*Server, error) {
-	sshConfig := &ssh.ServerConfig{
-		ServerVersion:           "SSH-2.0-taokystrong",
-		PublicKeyAuthAlgorithms: ssh.DefaultPubKeyAuthAlgos(),
-	}
+	sshConfig := &ssh.ServerConfig{ServerVersion: "SSH-2.0-taokystrong"}
 	for _, keyConf := range config.SSH.HostKeys {
 		key, err := validateKey(keyConf)
 		if err != nil {