Updated availability of algorithms in Dropbear. (#257)

2024-03-19 15:47:09 -04:00 · 2024-03-19 15:47:09 -04:00 · 3d403b1d70
parent 9fae870260
commit 3d403b1d70
9 changed files with 25 additions and 25 deletions
--- a/src/ssh_audit/ssh2_kexdb.py
+++ b/src/ssh_audit/ssh2_kexdb.py
@ -223,7 +223,7 @@ class SSH2_KexDB:  # pylint: disable=too-few-public-methods
            'null': [[], [FAIL_PLAINTEXT]],
            'pgp-sign-dss': [[], [FAIL_1024BIT_MODULUS]],
            'pgp-sign-rsa': [[], [FAIL_1024BIT_MODULUS]],
-            'rsa-sha2-256': [['7.2']],
+            'rsa-sha2-256': [['7.2,d2020.79']],
            'rsa-sha2-256-cert-v01@openssh.com': [['7.8']],
            'rsa-sha2-512': [['7.2']],
            'rsa-sha2-512-cert-v01@openssh.com': [['7.8']],
@ -242,7 +242,7 @@ class SSH2_KexDB:  # pylint: disable=too-few-public-methods
            'ssh-dss-sha256@ssh.com': [[], [FAIL_1024BIT_MODULUS]],
            'ssh-dss-sha384@ssh.com': [[], [FAIL_1024BIT_MODULUS]],
            'ssh-dss-sha512@ssh.com': [[], [FAIL_1024BIT_MODULUS]],
-            'ssh-ed25519': [['6.5,l10.7.0']],
+            'ssh-ed25519': [['6.5,d2020.79,l10.7.0']],
            'ssh-ed25519-cert-v01@openssh.com': [['6.5']],
            'ssh-ed448': [[]],
            'ssh-ed448-cert-v01@openssh.com': [[], [], [], [INFO_NEVER_IMPLEMENTED_IN_OPENSSH]],
@ -335,7 +335,7 @@ class SSH2_KexDB:  # pylint: disable=too-few-public-methods
            'cast128-ecb': [[], [FAIL_CAST], [WARN_CIPHER_MODE]],
            'cast128-ofb': [[], [FAIL_CAST], [WARN_CIPHER_MODE]],
            'chacha20-poly1305': [[], [], [], [INFO_DEFAULT_OPENSSH_CIPHER]],
-            'chacha20-poly1305@openssh.com': [['6.5'], [], [], [INFO_DEFAULT_OPENSSH_CIPHER]],
+            'chacha20-poly1305@openssh.com': [['6.5,d2020.79'], [], [], [INFO_DEFAULT_OPENSSH_CIPHER]],
            'crypticore128@ssh.com': [[], [FAIL_UNPROVEN]],
            'des-cbc': [[], [FAIL_DES], [WARN_CIPHER_MODE, WARN_BLOCK_SIZE]],
            'des-cfb': [[], [FAIL_DES], [WARN_CIPHER_MODE, WARN_BLOCK_SIZE]],
--- a/test/docker/expected_results/openssh_8.0p1_test1.json
+++ b/test/docker/expected_results/openssh_8.0p1_test1.json
@ -40,7 +40,7 @@
            "notes": {
                "info": [
                    "default cipher since OpenSSH 6.9",
-                    "available since OpenSSH 6.5"
+                    "available since OpenSSH 6.5, Dropbear SSH 2020.79"
                ],
                "warn": [
                    "vulnerable to the Terrapin attack (CVE-2023-48795), allowing message prefix truncation"
@ -229,7 +229,7 @@
            "keysize": 3072,
            "notes": {
                "info": [
-                    "available since OpenSSH 7.2"
+                    "available since OpenSSH 7.2, Dropbear SSH 2020.79"
                ]
            }
        },
@ -264,7 +264,7 @@
            "algorithm": "ssh-ed25519",
            "notes": {
                "info": [
-                    "available since OpenSSH 6.5"
+                    "available since OpenSSH 6.5, Dropbear SSH 2020.79"
                ]
            }
        }
--- a/test/docker/expected_results/openssh_8.0p1_test1.txt
+++ b/test/docker/expected_results/openssh_8.0p1_test1.txt
@ -1,7 +1,7 @@
 [0;36m# general[0m
 [0;32m(gen) banner: SSH-2.0-OpenSSH_8.0[0m
 [0;32m(gen) software: OpenSSH 8.0[0m
-[0;32m(gen) compatibility: OpenSSH 7.4+, Dropbear SSH 2018.76+[0m
+[0;32m(gen) compatibility: OpenSSH 7.4+, Dropbear SSH 2020.79+[0m
 [0;32m(gen) compression: enabled (zlib@openssh.com)[0m

 [0;36m# security[0m
@ -33,18 +33,18 @@

 [0;36m# host-key algorithms[0m
 [0;32m(key) rsa-sha2-512 (3072-bit)               -- [info] available since OpenSSH 7.2[0m
-[0;32m(key) rsa-sha2-256 (3072-bit)               -- [info] available since OpenSSH 7.2[0m
+[0;32m(key) rsa-sha2-256 (3072-bit)               -- [info] available since OpenSSH 7.2, Dropbear SSH 2020.79[0m
 [0;31m(key) ssh-rsa (3072-bit)                    -- [fail] using broken SHA-1 hash algorithm[0m
                                            `- [info] available since OpenSSH 2.5.0, Dropbear SSH 0.28
                                            `- [info] deprecated in OpenSSH 8.8: https://www.openssh.com/txt/release-8.8
 [0;31m(key) ecdsa-sha2-nistp256                   -- [fail] using elliptic curves that are suspected as being backdoored by the U.S. National Security Agency[0m
 [0;33m                                            `- [warn] using weak random number generator could reveal the key[0m
                                            `- [info] available since OpenSSH 5.7, Dropbear SSH 2013.62
-[0;32m(key) ssh-ed25519                           -- [info] available since OpenSSH 6.5[0m
+[0;32m(key) ssh-ed25519                           -- [info] available since OpenSSH 6.5, Dropbear SSH 2020.79[0m

 [0;36m# encryption algorithms (ciphers)[0m
 [0;33m(enc) chacha20-poly1305@openssh.com         -- [warn] vulnerable to the Terrapin attack (CVE-2023-48795), allowing message prefix truncation[0m
-                                            `- [info] available since OpenSSH 6.5
+                                            `- [info] available since OpenSSH 6.5, Dropbear SSH 2020.79
                                            `- [info] default cipher since OpenSSH 6.9
 [0;32m(enc) aes128-ctr                            -- [info] available since OpenSSH 3.7, Dropbear SSH 0.52[0m
 [0;32m(enc) aes192-ctr                            -- [info] available since OpenSSH 3.7[0m
--- a/test/docker/expected_results/openssh_8.0p1_test2.json
+++ b/test/docker/expected_results/openssh_8.0p1_test2.json
@ -40,7 +40,7 @@
            "notes": {
                "info": [
                    "default cipher since OpenSSH 6.9",
-                    "available since OpenSSH 6.5"
+                    "available since OpenSSH 6.5, Dropbear SSH 2020.79"
                ],
                "warn": [
                    "vulnerable to the Terrapin attack (CVE-2023-48795), allowing message prefix truncation"
@ -209,7 +209,7 @@
            "algorithm": "ssh-ed25519",
            "notes": {
                "info": [
-                    "available since OpenSSH 6.5"
+                    "available since OpenSSH 6.5, Dropbear SSH 2020.79"
                ]
            }
        },
--- a/test/docker/expected_results/openssh_8.0p1_test2.txt
+++ b/test/docker/expected_results/openssh_8.0p1_test2.txt
@ -1,7 +1,7 @@
 [0;36m# general[0m
 [0;32m(gen) banner: SSH-2.0-OpenSSH_8.0[0m
 [0;32m(gen) software: OpenSSH 8.0[0m
-[0;32m(gen) compatibility: OpenSSH 7.4+, Dropbear SSH 2018.76+[0m
+[0;32m(gen) compatibility: OpenSSH 7.4+, Dropbear SSH 2020.79+[0m
 [0;32m(gen) compression: enabled (zlib@openssh.com)[0m

 [0;36m# security[0m
@ -32,12 +32,12 @@
                                            `- [info] available since OpenSSH 3.9, Dropbear SSH 0.53

 [0;36m# host-key algorithms[0m
-[0;32m(key) ssh-ed25519                           -- [info] available since OpenSSH 6.5[0m
+[0;32m(key) ssh-ed25519                           -- [info] available since OpenSSH 6.5, Dropbear SSH 2020.79[0m
 [0;32m(key) ssh-ed25519-cert-v01@openssh.com (256-bit cert/256-bit ssh-ed25519 CA) -- [info] available since OpenSSH 6.5[0m

 [0;36m# encryption algorithms (ciphers)[0m
 [0;33m(enc) chacha20-poly1305@openssh.com         -- [warn] vulnerable to the Terrapin attack (CVE-2023-48795), allowing message prefix truncation[0m
-                                            `- [info] available since OpenSSH 6.5
+                                            `- [info] available since OpenSSH 6.5, Dropbear SSH 2020.79
                                            `- [info] default cipher since OpenSSH 6.9
 [0;32m(enc) aes128-ctr                            -- [info] available since OpenSSH 3.7, Dropbear SSH 0.52[0m
 [0;32m(enc) aes192-ctr                            -- [info] available since OpenSSH 3.7[0m
--- a/test/docker/expected_results/openssh_8.0p1_test3.json
+++ b/test/docker/expected_results/openssh_8.0p1_test3.json
@ -40,7 +40,7 @@
            "notes": {
                "info": [
                    "default cipher since OpenSSH 6.9",
-                    "available since OpenSSH 6.5"
+                    "available since OpenSSH 6.5, Dropbear SSH 2020.79"
                ],
                "warn": [
                    "vulnerable to the Terrapin attack (CVE-2023-48795), allowing message prefix truncation"
@ -135,7 +135,7 @@
            "algorithm": "ssh-ed25519",
            "notes": {
                "info": [
-                    "available since OpenSSH 6.5"
+                    "available since OpenSSH 6.5, Dropbear SSH 2020.79"
                ]
            }
        }
--- a/test/docker/expected_results/openssh_8.0p1_test3.txt
+++ b/test/docker/expected_results/openssh_8.0p1_test3.txt
@ -1,7 +1,7 @@
 [0;36m# general[0m
 [0;32m(gen) banner: SSH-2.0-OpenSSH_8.0[0m
 [0;32m(gen) software: OpenSSH 8.0[0m
-[0;32m(gen) compatibility: OpenSSH 7.4+, Dropbear SSH 2018.76+[0m
+[0;32m(gen) compatibility: OpenSSH 7.4+, Dropbear SSH 2020.79+[0m
 [0;32m(gen) compression: enabled (zlib@openssh.com)[0m

 [0;36m# security[0m
@ -19,11 +19,11 @@
 [0;32m                                                      `- [info] OpenSSH's GEX fallback mechanism was triggered during testing. Very old SSH clients will still be able to create connections using a 2048-bit modulus, though modern clients will use 4096. This can only be disabled by recompiling the code (see https://github.com/openssh/openssh-portable/blob/V_9_4/dh.c#L477).[0m

 [0;36m# host-key algorithms[0m
-[0;32m(key) ssh-ed25519                           -- [info] available since OpenSSH 6.5[0m
+[0;32m(key) ssh-ed25519                           -- [info] available since OpenSSH 6.5, Dropbear SSH 2020.79[0m

 [0;36m# encryption algorithms (ciphers)[0m
 [0;33m(enc) chacha20-poly1305@openssh.com         -- [warn] vulnerable to the Terrapin attack (CVE-2023-48795), allowing message prefix truncation[0m
-                                            `- [info] available since OpenSSH 6.5
+                                            `- [info] available since OpenSSH 6.5, Dropbear SSH 2020.79
                                            `- [info] default cipher since OpenSSH 6.9
 [0;32m(enc) aes256-gcm@openssh.com                -- [info] available since OpenSSH 6.2[0m
 [0;32m(enc) aes128-gcm@openssh.com                -- [info] available since OpenSSH 6.2[0m
--- a/test/docker/expected_results/tinyssh_20190101_test1.json
+++ b/test/docker/expected_results/tinyssh_20190101_test1.json
@ -18,7 +18,7 @@
            "notes": {
                "info": [
                    "default cipher since OpenSSH 6.9",
-                    "available since OpenSSH 6.5"
+                    "available since OpenSSH 6.5, Dropbear SSH 2020.79"
                ],
                "warn": [
                    "vulnerable to the Terrapin attack (CVE-2023-48795), allowing message prefix truncation"
@ -75,7 +75,7 @@
            "algorithm": "ssh-ed25519",
            "notes": {
                "info": [
-                    "available since OpenSSH 6.5"
+                    "available since OpenSSH 6.5, Dropbear SSH 2020.79"
                ]
            }
        }
--- a/test/docker/expected_results/tinyssh_20190101_test1.txt
+++ b/test/docker/expected_results/tinyssh_20190101_test1.txt
@ -1,6 +1,6 @@
 [0;36m# general[0m
 [0;32m(gen) software: TinySSH noversion[0m
-[0;32m(gen) compatibility: OpenSSH 8.0-8.4, Dropbear SSH 2018.76+[0m
+[0;32m(gen) compatibility: OpenSSH 8.0-8.4, Dropbear SSH 2020.79+[0m
 [0;32m(gen) compression: disabled[0m

 [0;36m# key exchange algorithms[0m
@ -13,11 +13,11 @@
                                              `- [info] the sntrup4591761 algorithm was withdrawn, as it may not provide strong post-quantum security

 [0;36m# host-key algorithms[0m
-[0;32m(key) ssh-ed25519                             -- [info] available since OpenSSH 6.5[0m
+[0;32m(key) ssh-ed25519                             -- [info] available since OpenSSH 6.5, Dropbear SSH 2020.79[0m

 [0;36m# encryption algorithms (ciphers)[0m
 [0;33m(enc) chacha20-poly1305@openssh.com           -- [warn] vulnerable to the Terrapin attack (CVE-2023-48795), allowing message prefix truncation[0m
-                                              `- [info] available since OpenSSH 6.5
+                                              `- [info] available since OpenSSH 6.5, Dropbear SSH 2020.79
                                              `- [info] default cipher since OpenSSH 6.9

 [0;36m# message authentication code algorithms[0m