Merge pull request #204 from dev-sec/ubuntu22

add basic support for Ubuntu 22
dev-sec · Aug 6, 2022 · b809e0b · b809e0b
2 parents 1f868fa + 4d9a75a
commit b809e0b
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/libraries/ssh_crypto.rb b/libraries/ssh_crypto.rb
@@ -82,7 +82,13 @@ def valid_kexs
     case inspec.os[:name]
     # https://packages.ubuntu.com/search?keywords=openssh-server
     when 'ubuntu'
-      kex = inspec.os[:release][0, 2] >= '19' ? kex80 : kex66
+      kex = if inspec.os[:release][0, 2] >= '22'
+              kex85
+            elsif inspec.os[:release][0, 2] >= '19'
+              kex80
+            else
+              kex66
+            end
     # https://packages.debian.org/search?keywords=openssh-server
     when 'debian'
       case inspec.os[:release]
@@ -215,7 +221,7 @@ def valid_privseparation
       end
     when 'ubuntu'
       case inspec.os[:release]
-      when /^18\./, /^20\./
+      when /^18\./, /^20\./, /^22\./
         ps = ps75
       end
     when 'fedora', 'alpine', 'arch'