From c875950c438b1ccbb546fecb4905680a0cbd38a7 Mon Sep 17 00:00:00 2001 From: Eduardo Bacchi Kienetz Date: Fri, 4 Dec 2020 08:52:26 -0500 Subject: ssh: allow setting allowed MAC algorithms for built-in server (#6435) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: ᴜɴᴋɴᴡᴏɴ --- internal/conf/static.go | 1 + internal/conf/testdata/TestInit.golden.ini | 1 + 2 files changed, 2 insertions(+) (limited to 'internal/conf') 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 -- cgit v1.2.3