aboutsummaryrefslogtreecommitdiff
path: root/internal/conf
diff options
context:
space:
mode:
authorJoe Chen <jc@unknwon.io>2023-02-12 13:10:41 +0800
committerGitHub <noreply@github.com>2023-02-12 13:10:41 +0800
commitb34ee734972429cc16686edc87dd38ad5a2f65aa (patch)
tree253cf458dcf9212fbf58fb1229cec09d0cf0f1f3 /internal/conf
parent92f66c9eac950c7b28a83f5b02c1209897bb89b7 (diff)
feat(ssh): support dynamic list of algorithms (#7345)
Diffstat (limited to 'internal/conf')
-rw-r--r--internal/conf/static.go1
-rw-r--r--internal/conf/testdata/TestInit.golden.ini1
2 files changed, 2 insertions, 0 deletions
diff --git a/internal/conf/static.go b/internal/conf/static.go
index 24e9acab..016fd139 100644
--- a/internal/conf/static.go
+++ b/internal/conf/static.go
@@ -305,6 +305,7 @@ type SSHOpts struct {
ListenPort int `ini:"SSH_LISTEN_PORT"`
ServerCiphers []string `ini:"SSH_SERVER_CIPHERS"`
ServerMACs []string `ini:"SSH_SERVER_MACS"`
+ ServerAlgorithms []string `ini:"SSH_SERVER_ALGORITHMS"`
}
// SSH settings
diff --git a/internal/conf/testdata/TestInit.golden.ini b/internal/conf/testdata/TestInit.golden.ini
index 80f222df..1f0e50b7 100644
--- a/internal/conf/testdata/TestInit.golden.ini
+++ b/internal/conf/testdata/TestInit.golden.ini
@@ -32,6 +32,7 @@ SSH_LISTEN_HOST=0.0.0.0
SSH_LISTEN_PORT=22
SSH_SERVER_CIPHERS=aes128-ctr,aes192-ctr,aes256-ctr,aes128-gcm@openssh.com,arcfour256,arcfour128
SSH_SERVER_MACS=hmac-sha2-256-etm@openssh.com,hmac-sha2-256,hmac-sha1
+SSH_SERVER_ALGORITHMS=rsa,ecdsa,ed25519
[repository]
ROOT=/tmp/gogs-repositories