Removing sshd_use_strong_ciphers parameter as sshd_hardened_ssl does the job

diff --git a/templates/sshd_config/CentOS.erb b/templates/sshd_config/CentOS.erb
index 2b4f2feaad07e4dcb311429d3c6ddb2d73b76519..859759a9e77507b4fe46bc4ee7cf3077b455d823 100644 (file)
--- a/templates/sshd_config/CentOS.erb
+++ b/templates/sshd_config/CentOS.erb
@@ -212,8 +212,3 @@ MACs hmac-sha1
 <%- unless sshd_tail_additional_options.to_s.empty? then %>
 <%= sshd_tail_additional_options %>
 <%- end %>
-
-<%- if sshd_use_strong_ciphers.to_s == 'yes' then -%>
-Ciphers aes128-ctr
-MACs hmac-sha1
-<%- end %>

diff --git a/templates/sshd_config/Debian_etch.erb b/templates/sshd_config/Debian_etch.erb
index 93fefc27c30b3824e8bdac9d07aae7069a4ba941..dbef8b848f87c5b9854cedb5d440e441e16feaa2 100644 (file)
--- a/templates/sshd_config/Debian_etch.erb
+++ b/templates/sshd_config/Debian_etch.erb
@@ -182,8 +182,3 @@ MACs hmac-sha1
 <%- unless sshd_tail_additional_options.to_s.empty? then %>
 <%= sshd_tail_additional_options %>
 <%- end %>
-
-<%- if sshd_use_strong_ciphers.to_s == 'yes' then -%>
-Ciphers aes128-ctr
-MACs hmac-sha1
-<%- end %>

diff --git a/templates/sshd_config/Debian_lenny.erb b/templates/sshd_config/Debian_lenny.erb
index 0c551e5f7f45464e35dc0fac0c1b45dc02858128..c168114d23deb6f6bcf106a70179f99bb0626b27 100644 (file)
--- a/templates/sshd_config/Debian_lenny.erb
+++ b/templates/sshd_config/Debian_lenny.erb
@@ -191,8 +191,3 @@ MACs hmac-sha1
 <%- unless sshd_tail_additional_options.to_s.empty? then %>
 <%= sshd_tail_additional_options %>
 <%- end %>
-
-<%- if sshd_use_strong_ciphers.to_s == 'yes' then -%>
-Ciphers aes128-ctr
-MACs hmac-sha1
-<%- end %>

diff --git a/templates/sshd_config/Debian_squeeze.erb b/templates/sshd_config/Debian_squeeze.erb
index 1f921125983fe9a7e4015c97e1096ba6810aab48..dfebcc3777c4565c14495e55f2754d299c8a50f6 100644 (file)
--- a/templates/sshd_config/Debian_squeeze.erb
+++ b/templates/sshd_config/Debian_squeeze.erb
@@ -205,8 +205,3 @@ MACs hmac-sha1
 <%- unless sshd_tail_additional_options.to_s.empty? then %>
 <%= sshd_tail_additional_options %>
 <%- end %>
-
-<%- if sshd_use_strong_ciphers.to_s == 'yes' then -%>
-Ciphers aes128-ctr
-MACs hmac-sha1
-<%- end %>

diff --git a/templates/sshd_config/Gentoo.erb b/templates/sshd_config/Gentoo.erb
index 40a70e7adc073e0057bbbe3677697c9422bd7df4..38674ce5c699fc84384b8df2a40de20690b88c85 100644 (file)
--- a/templates/sshd_config/Gentoo.erb
+++ b/templates/sshd_config/Gentoo.erb
@@ -216,8 +216,3 @@ MACs hmac-sha1
 <%- unless sshd_tail_additional_options.to_s.empty? then %>
 <%= sshd_tail_additional_options %>
 <%- end %>
-
-<%- if sshd_use_strong_ciphers.to_s == 'yes' then -%>
-Ciphers aes128-ctr
-MACs hmac-sha1
-<%- end %>

diff --git a/templates/sshd_config/OpenBSD.erb b/templates/sshd_config/OpenBSD.erb
index be76df296e54c6c9ed05d6083610964da1e0c4b8..7a20cd9c7f9e580c7b47c12a19c916187b7cb7b7 100644 (file)
--- a/templates/sshd_config/OpenBSD.erb
+++ b/templates/sshd_config/OpenBSD.erb
@@ -192,8 +192,3 @@ MACs hmac-sha1
 <%- unless sshd_tail_additional_options.to_s.empty? then %>
 <%= sshd_tail_additional_options %>
 <%- end %>
-
-<%- if sshd_use_strong_ciphers.to_s == 'yes' then -%>
-Ciphers aes128-ctr
-MACs hmac-sha1
-<%- end %>

diff --git a/templates/sshd_config/Ubuntu_lucid.erb b/templates/sshd_config/Ubuntu_lucid.erb
index 904a40987131ddb33b256ef917fd42b48e7e39d3..1c44c7ba7d2c9c34b7ec9ac78620fa29164af088 100644 (file)
--- a/templates/sshd_config/Ubuntu_lucid.erb
+++ b/templates/sshd_config/Ubuntu_lucid.erb
@@ -188,7 +188,7 @@ PrintMotd no
 <%= sshd_tail_additional_options %>
 <%- end %>
 
-<%- if sshd_use_strong_ciphers.to_s == 'yes' then -%>
+<%- if sshd_hardened_ssl.to_s == 'yes' then -%>
 Ciphers aes128-ctr
 MACs hmac-sha1
 <%- end %>