diff options
| author | Igor Drozdov <idrozdov@gitlab.com> | 2022-05-23 08:41:51 +0000 |
|---|---|---|
| committer | Igor Drozdov <idrozdov@gitlab.com> | 2022-05-23 08:41:51 +0000 |
| commit | 3909c673ef1b1bc59cae549682615947a1679ad5 (patch) | |
| tree | 6b6351c6647325241e35a678e31b5d96b599ade2 | |
| parent | 1da03256fb98ee4a11977c32127314684005ab9d (diff) | |
| parent | 0bef85e70d854465de034866650345dd551f17e8 (diff) | |
| download | gitlab-shell-3909c673ef1b1bc59cae549682615947a1679ad5.tar.gz | |
Merge branch 'id-revert-narrowing-kex-algos' into 'main'
Return support for diffie-hellman-group14-sha1
See merge request gitlab-org/gitlab-shell!644
| -rw-r--r-- | config.yml.example | 2 | ||||
| -rw-r--r-- | internal/sshd/server_config.go | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/config.yml.example b/config.yml.example index 1fdb6f9..0e75d75 100644 --- a/config.yml.example +++ b/config.yml.example @@ -89,7 +89,7 @@ sshd: # Specifies the available message authentication code algorithms that are used for protecting data integrity macs: [hmac-sha2-256-etm@openssh.com, hmac-sha2-512-etm@openssh.com, hmac-sha2-256, hmac-sha2-512, hmac-sha1] # Specifies the available Key Exchange algorithms - kex_algorithms: [curve25519-sha256, curve25519-sha256@libssh.org, ecdh-sha2-nistp256, ecdh-sha2-nistp384, ecdh-sha2-nistp521, diffie-hellman-group14-sha256] + kex_algorithms: [curve25519-sha256, curve25519-sha256@libssh.org, ecdh-sha2-nistp256, ecdh-sha2-nistp384, ecdh-sha2-nistp521, diffie-hellman-group14-sha256, diffie-hellman-group14-sha1] # Specified the ciphers allowed ciphers: [aes128-gcm@openssh.com, chacha20-poly1305@openssh.com, aes256-gcm@openssh.com, aes128-ctr, aes192-ctr,aes256-ctr] # SSH host key files. diff --git a/internal/sshd/server_config.go b/internal/sshd/server_config.go index bb7886c..7fb73dc 100644 --- a/internal/sshd/server_config.go +++ b/internal/sshd/server_config.go @@ -32,6 +32,7 @@ var ( "ecdh-sha2-nistp384", "ecdh-sha2-nistp521", "diffie-hellman-group14-sha256", + "diffie-hellman-group14-sha1", } ) |