ubuntu versions (#151)

* ubuntu versions

Add recent ubuntu versions to get the correct algorithms list.

Signed-off-by: Michée Lengronne <[email protected]>

* ubuntu versions comparison

Signed-off-by: Michée Lengronne <[email protected]>

* rubocop style

Signed-off-by: Michée Lengronne <[email protected]>

* useless rubocop rule

Signed-off-by: Michée Lengronne <[email protected]>

Author: micheelengronne

libraries/ssh_crypto.rb

@@ -23,7 +23,7 @@ def ssh_version
     inspec.command('ssh -V 2>&1 | cut -f1 -d" " | cut -f2 -d"_"').stdout.to_f
   end
 
-  def valid_ciphers # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength
+  def valid_ciphers # rubocop:disable Metrics/CyclomaticComplexity
     # define a set of default ciphers
     ciphers53 = 'aes256-ctr,aes192-ctr,aes128-ctr'
     ciphers66 = '[email protected],[email protected],[email protected],aes256-ctr,aes192-ctr,aes128-ctr'
@@ -32,12 +32,7 @@ def valid_ciphers # rubocop:disable Metrics/CyclomaticComplexity, Metrics/Method
     # adjust ciphers based on OS + release
     case inspec.os[:name]
     when 'ubuntu'
-      case inspec.os[:release]
-      when '12.04'
-        ciphers = ciphers53
-      when '14.04', '15.10', '16.04', '18.04'
-        ciphers = ciphers66
-      end
+      ciphers = ciphers66 if inspec.os[:release][0, 2] > '12'
     when 'debian'
       case inspec.os[:release]
       when /^6\./, /^7\./
@@ -73,7 +68,7 @@ def valid_ciphers # rubocop:disable Metrics/CyclomaticComplexity, Metrics/Method
     ciphers
   end
 
-  def valid_kexs # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength
+  def valid_kexs # rubocop:disable Metrics/CyclomaticComplexity
     # define a set of default KEXs
     kex66 = '[email protected],diffie-hellman-group-exchange-sha256'
     kex59 = 'diffie-hellman-group-exchange-sha256'
@@ -82,12 +77,7 @@ def valid_kexs # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLen
     # adjust KEXs based on OS + release
     case inspec.os[:name]
     when 'ubuntu'
-      case inspec.os[:release]
-      when '12.04'
-        kex = kex59
-      when '14.04', '15.10', '16.04', '18.04'
-        kex = kex66
-      end
+      kex = kex66 if inspec.os[:release][0, 2] > '12'
     when 'debian'
       case inspec.os[:release]
       when /^6\./
@@ -136,12 +126,7 @@ def valid_macs # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLen
     # adjust MACs based on OS + release
     case inspec.os[:name]
     when 'ubuntu'
-      case inspec.os[:release]
-      when '12.04'
-        macs = macs59
-      when '14.04', '15.10', '16.04', '18.04'
-        macs = macs66
-      end
+      macs = macs66 if inspec.os[:release][0, 2] > '12'
     when 'debian'
       case inspec.os[:release]
       when /^6\./
@@ -225,20 +210,15 @@ def valid_privseparation # rubocop:disable Metrics/CyclomaticComplexity
   end
 
   # return a list of valid algoriths for a current platform
-  def valid_algorithms # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength
+  def valid_algorithms # rubocop:disable Metrics/CyclomaticComplexity
     alg53 = %w[rsa]
     alg60 = %w[rsa ecdsa]
     alg66 = %w[rsa ecdsa ed25519]
     alg = alg66 # probably its a best suitable set for everything unknown
 
     case inspec.os[:name]
     when 'ubuntu'
-      case inspec.os[:release]
-      when '12.04'
-        alg = alg53
-      when '14.04', '15.10', '16.04', '18.04'
-        alg = alg66
-      end
+      alg = alg53 if inspec.os[:release][0, 2] < '14'
     when 'debian'
       case inspec.os[:release]
       when /^7\./