ssh_version module

Author: h00die

documentation/modules/auxiliary/scanner/ssh/ssh_version.md

@@ -35,9 +35,9 @@ CMD ["/usr/sbin/sshd","-D"]
 
 ## Options
 
-### ENCRYPTION
+### EXTENDED_CHECKS
 
-Check encryption for issues. Defaults to `true`
+Check for cryptographic issues. Defaults to `true`
 
 ## Scenarios
 
@@ -49,39 +49,38 @@ msf5 auxiliary(scanner/ssh/ssh_version) > set RHOSTS github.com
 RHOSTS => github.com
 msf5 auxiliary(scanner/ssh/ssh_version) > run
 
-[*] 140.82.113.3 - Key Fingerprint: 65:96:2d:fc:e8:d5:a9:11:64:0c:0f:ea:00:6e:5b:bd
-[+] 140.82.113.3 - Host Key Encryption ecdsa-sha2-nistp256 uses a weak elliptic curve and should not be used.
-[*] 140.82.113.3 - SSH server version: SSH-2.0-babeld-8e18a363
-[*] 140.82.113.3 - Server Encryption
-=================
+[*] 140.82.113.4 - Key Fingerprint: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl
+[*] 140.82.113.4 - SSH server version: SSH-2.0-babeld-8405f9f3
+[*] 140.82.113.4 - Server Information and Encryption
+=================================
 
-  Type                Value
-  ----                -----
-  Compression         none
-  Compression         [email protected]
-  Compression         zlib
-  Encryption          [email protected]
-  Encryption          [email protected]
-  Encryption          [email protected]
-  Encryption          aes256-ctr
-  Encryption          aes192-ctr
-  Encryption          aes128-ctr
-  HMAC                [email protected]
-  HMAC                [email protected]
-  HMAC                hmac-sha2-512
-  HMAC                hmac-sha2-256
-  Host Key            ssh-ed25519
-  Host Key            ecdsa-sha2-nistp256
-  Host Key            rsa-sha2-512
-  Host Key            rsa-sha2-256
-  Host Key            ssh-rsa
-  Key Exchange (kex)  curve25519-sha256
-  Key Exchange (kex)  [email protected]
-  Key Exchange (kex)  ecdh-sha2-nistp256
-  Key Exchange (kex)  ecdh-sha2-nistp384
-  Key Exchange (kex)  ecdh-sha2-nistp521
-  Key Exchange (kex)  diffie-hellman-group-exchange-sha256
-  Key Exchange (kex)  [email protected]
+  Type                           Value                                 Note
+  ----                           -----                                 ----
+  encryption.compression         none
+  encryption.compression         [email protected]
+  encryption.compression         zlib
+  encryption.encryption          [email protected]
+  encryption.encryption          [email protected]
+  encryption.encryption          [email protected]
+  encryption.encryption          aes256-ctr
+  encryption.encryption          aes192-ctr
+  encryption.encryption          aes128-ctr
+  encryption.hmac                [email protected]
+  encryption.hmac                [email protected]
+  encryption.hmac                hmac-sha2-512
+  encryption.hmac                hmac-sha2-256
+  encryption.host_key            ssh-ed25519
+  encryption.host_key            ecdsa-sha2-nistp256                   Weak elliptic curve
+  encryption.host_key            rsa-sha2-512
+  encryption.host_key            rsa-sha2-256
+  encryption.host_key            ssh-rsa
+  encryption.key_exchange_(kex)  curve25519-sha256
+  encryption.key_exchange_(kex)  [email protected]
+  encryption.key_exchange_(kex)  ecdh-sha2-nistp256
+  encryption.key_exchange_(kex)  ecdh-sha2-nistp384
+  encryption.key_exchange_(kex)  ecdh-sha2-nistp521
+  encryption.key_exchange_(kex)  diffie-hellman-group-exchange-sha256
+  encryption.key_exchange_(kex)  [email protected]
 
 [*] Scanned 1 of 1 hosts (100% complete)
 [*] Auxiliary module execution completed

modules/auxiliary/scanner/ssh/ssh_version.rb

@@ -33,7 +33,7 @@ def initialize
       [
         Opt::RPORT(22),
         OptInt.new('TIMEOUT', [true, 'Timeout for the SSH probe', 30]),
-        OptBool.new('ENCRYPTION', [false, 'Check encryption for issues', true])
+        OptBool.new('EXTENDED_CHECKS', [true, 'Check for cryptographic issues', true])
       ],
       self.class
     )
@@ -235,7 +235,7 @@ def run_host(target_host)
 
       report_service(host: target_host, port: rport, name: 'ssh', proto: 'tcp', info: ident)
 
-      return unless datastore['ENCRYPTION']
+      return unless datastore['EXTENDED_CHECKS']
 
       table = Rex::Text::Table.new(
         'Header' => 'Server Information and Encryption',