diff options
| author | Eduardo Bacchi Kienetz <eduardo@kienetz.com> | 2020-12-04 08:52:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-04 21:52:26 +0800 |
| commit | c875950c438b1ccbb546fecb4905680a0cbd38a7 (patch) | |
| tree | 2fc428574c9471d067f8da8f535cbd30623cd0ea /internal/conf | |
| parent | 71eeb2f0c04019c891648316a0aac29cff109bf0 (diff) | |
ssh: allow setting allowed MAC algorithms for built-in server (#6435)
Co-authored-by: ᴜɴᴋɴᴡᴏɴ <u@gogs.io>
Diffstat (limited to 'internal/conf')
| -rw-r--r-- | internal/conf/static.go | 1 | ||||
| -rw-r--r-- | internal/conf/testdata/TestInit.golden.ini | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/internal/conf/static.go b/internal/conf/static.go index f39bf929..c9aabc03 100644 --- a/internal/conf/static.go +++ b/internal/conf/static.go @@ -59,6 +59,7 @@ var ( ListenHost string `ini:"SSH_LISTEN_HOST"` ListenPort int `ini:"SSH_LISTEN_PORT"` ServerCiphers []string `ini:"SSH_SERVER_CIPHERS"` + ServerMACs []string `ini:"SSH_SERVER_MACS"` } // Repository settings diff --git a/internal/conf/testdata/TestInit.golden.ini b/internal/conf/testdata/TestInit.golden.ini index 1e545503..a14962fe 100644 --- a/internal/conf/testdata/TestInit.golden.ini +++ b/internal/conf/testdata/TestInit.golden.ini @@ -31,6 +31,7 @@ START_SSH_SERVER=false 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 [repository] ROOT=/tmp/gogs-repositories |