Auto-merge for PR #12 via VersionBot

Also use ecdsa and dsa host keys
balena-io · May 18, 2017 · a9b17ff · a9b17ff
2 parents 76e8933 + a583dbc
commit a9b17ff
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file
 automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## v1.1.2 - 2017-05-18
+
+* Also use ecdsa and dsa host keys [Will Boyce]
+
 ## v1.1.1 - 2017-05-17
 
 * Fix issue where sshproxy would fail to start if no banner was specified [Will Boyce]

diff --git a/sshproxy.go b/sshproxy.go
@@ -43,8 +43,8 @@ type Server struct {
 
 // New takes a directory to generate/store server keys, a path to the shell
 // and an ssh.ServerConfig. If no ServerConfig is provided, then
-// ServerConfig.NoClientAuth is set to true. ed25519 and rsa server keys
-// and loaded, and generated if they do not exist. Returns a new Server.
+// ServerConfig.NoClientAuth is set to true. ed25519, rsa, ecdsa and dsa
+// keys are loaded, and generated if they do not exist. Returns a new Server.
 func New(keyDir, shell string, sshConfig *ssh.ServerConfig) *Server {
 	s := &Server{
 		keyDir: keyDir,
@@ -56,7 +56,7 @@ func New(keyDir, shell string, sshConfig *ssh.ServerConfig) *Server {
 			NoClientAuth: true,
 		}
 	}
-	for _, keyType := range []string{"ed25519", "rsa"} {
+	for _, keyType := range []string{"ed25519", "rsa", "ecdsa", "dsa"} {
 		s.addHostKey(keyType)
 	}