Skip to content

Commit 887e72d

Browse files
committed
Merge pull request #83 from Rockstar04/debianJessie
Modern alogs for Jessie
2 parents ae0cd66 + f1a29a9 commit 887e72d

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

libraries/get_ssh_ciphers.rb

+4
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ def self.get_ciphers(node, cbc_required)
4242
if node['platform'] == 'ubuntu' && node['platform_version'].to_f >= 14.04
4343
Chef::Log.info('Detected Ubuntu 14.04 or newer, use new ciphers')
4444
cipher = ciphers_66
45+
46+
elsif node['platform'] == 'debian' && node['platform_version'].to_f >= 8
47+
Chef::Log.info('Detected Debian 8 or newer, use new ciphers')
48+
cipher = ciphers_66
4549
end
4650

4751
Chef::Log.info("Choose cipher: #{cipher[weak_ciphers]}")

libraries/get_ssh_kex.rb

+4
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ def self.get_kexs(node, weak_kex)
4242
Chef::Log.info('Detected Ubuntu 14.04 or newer, use new key exchange algorithms')
4343
kex = kex_66
4444

45+
elsif node['platform'] == 'debian' && node['platform_version'].to_f >= 8
46+
Chef::Log.info('Detected Debian 8 or newer, use new key exchange algorithms')
47+
kex = kex_66
48+
4549
# deactivate kex on redhat
4650
elsif node['platform_family'] == 'rhel'
4751
kex = {}

libraries/get_ssh_macs.rb

+4
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ def self.get_macs(node, weak_hmac)
4545
Chef::Log.info('Detected Ubuntu 14.04 or newer, use new macs')
4646
macs = macs_66
4747

48+
elsif node['platform'] == 'debian' && node['platform_version'].to_f >= 8
49+
Chef::Log.info('Detected Debian 8 or newer, use new macs')
50+
macs = macs_66
51+
4852
# stick to 53 for rhel <= 6, verify for rhel >= 7
4953
elsif node['platform_family'] == 'rhel'
5054
Chef::Log.info('Detected RedHat Family, use old macs')

0 commit comments

Comments
 (0)