diff options
| author | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-05-07 15:30:07 +0000 |
|---|---|---|
| committer | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-05-07 15:30:07 +0000 |
| commit | df03b0865c03b3408c969fc4e8fae53e0f28f1e4 (patch) | |
| tree | 23d6821762f4b06af3809e686a722edd98af94b2 /templates/sshd_config/Ubuntu.erb | |
| parent | b5e16ec06499e45b4efd9f7353bb31f3a972417e (diff) | |
| parent | e4a9c15987372e63ace244a92619bdd2e4c5407a (diff) | |
| download | puppet-sshd-df03b0865c03b3408c969fc4e8fae53e0f28f1e4.tar.gz puppet-sshd-df03b0865c03b3408c969fc4e8fae53e0f28f1e4.tar.bz2 | |
Merge branch 'enhance_hardened' into 'master'
Enhance hardened
This implements as many recommendations in https://stribika.github.io/2015/01/04/secure-secure-shell.html as possible
See merge request !10
Diffstat (limited to 'templates/sshd_config/Ubuntu.erb')
| -rw-r--r-- | templates/sshd_config/Ubuntu.erb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/templates/sshd_config/Ubuntu.erb b/templates/sshd_config/Ubuntu.erb index 0ba323f..29c1bf9 100644 --- a/templates/sshd_config/Ubuntu.erb +++ b/templates/sshd_config/Ubuntu.erb @@ -115,10 +115,16 @@ AllowUsers <%= s %> AllowGroups <%= s %> <%- end -%> -<% if scope.lookupvar('sshd::hardened_ssl') == 'yes' -%> +<% if scope.lookupvar('sshd::hardened') == 'yes' -%> +<% if (scope.function_versioncmp([scope.lookupvar('::ssh_version'),'6.5'])) >= 0 -%> +KexAlgorithms curve25519-sha256@libssh.org +Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes256-ctr +MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,hmac-ripemd160-etm@openssh.com,umac-128-etm@openssh.com,hmac-sha2-512,hmac-sha2-256,hmac-ripemd160,umac-128@openssh.com +<% else -%> Ciphers aes256-ctr MACs hmac-sha1 <% end -%> +<% end -%> <% unless (s=scope.lookupvar('sshd::tail_additional_options')).empty? -%> <%= s %> |