From 29722af1ae51333a7da742b5e02a5e7fe5983aab Mon Sep 17 00:00:00 2001
From: spacetourist <guy.callum@gmail.com>
Date: Fri, 10 Feb 2017 19:04:43 +0000
Subject: Configurable SSH cipher suite (#4109)

* Configurable SSH cipher suite

* Maintain ordering
---
 modules/setting/setting.go | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'modules/setting')

diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index b5c6d9c9..4db8dbff 100644
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -85,6 +85,7 @@ var (
 		ListenHost          string         `ini:"SSH_LISTEN_HOST"`
 		ListenPort          int            `ini:"SSH_LISTEN_PORT"`
 		RootPath            string         `ini:"SSH_ROOT_PATH"`
+		ServerCiphers       []string       `ini:"SSH_SERVER_CIPHERS"`
 		KeyTestPath         string         `ini:"SSH_KEY_TEST_PATH"`
 		KeygenPath          string         `ini:"SSH_KEYGEN_PATH"`
 		MinimumKeySizeCheck bool           `ini:"-"`
@@ -425,6 +426,7 @@ func NewContext() {
 	}
 
 	SSH.RootPath = path.Join(homeDir, ".ssh")
+	SSH.ServerCiphers = sec.Key("SSH_SERVER_CIPHERS").Strings(",")
 	SSH.KeyTestPath = os.TempDir()
 	if err = Cfg.Section("server").MapTo(&SSH); err != nil {
 		log.Fatal(4, "Fail to map SSH settings: %v", err)
-- 
cgit v1.2.3