This commit is contained in:
dreizehnutters
2024-06-22 17:42:55 +02:00
committed by GitHub
2 changed files with 14 additions and 8 deletions
+13 -3
View File
@@ -50,9 +50,19 @@ class HostKeyTest:
'rsa-sha2-256-cert-v01@openssh.com': {'cert': True, 'variable_key_len': True},
'rsa-sha2-512-cert-v01@openssh.com': {'cert': True, 'variable_key_len': True},
'ssh-ed25519': {'cert': False, 'variable_key_len': False},
'ssh-ed25519-cert-v01@openssh.com': {'cert': True, 'variable_key_len': False},
}
'ssh-ed25519': {'cert': False, 'variable_key_len': True},
'ssh-ed25519-cert-v01@openssh.com': {'cert': True, 'variable_key_len': True},
'ecdsa-sha2-nistp256': {'cert': False, 'variable_key_len': True},
'ecdsa-sha2-nistp256-cert-v01@openssh.com': {'cert': True, 'variable_key_len': True},
'ecdsa-sha2-nistp384': {'cert': False, 'variable_key_len': True},
'ecdsa-sha2-nistp384-cert-v01@openssh.com': {'cert': True, 'variable_key_len': True},
'ecdsa-sha2-nistp521': {'cert': False, 'variable_key_len': True},
'ecdsa-sha2-nistp521-cert-v01@openssh.com': {'cert': True, 'variable_key_len': True}
}
TWO2K_MODULUS_WARNING = '2048-bit modulus only provides 112-bits of symmetric strength'
SMALL_ECC_MODULUS_WARNING = '224-bit ECC modulus only provides 112-bits of symmetric strength'
+1 -5
View File
@@ -1148,17 +1148,13 @@ def build_struct(target_host: str, banner: Optional['Banner'], cves: List[Dict[s
}
if algorithm in host_keys:
hostkey_info = host_keys[algorithm]
hostkey_size = cast(int, hostkey_info['hostkey_size'])
entry['keysize'] = cast(int, hostkey_info['hostkey_size'])
ca_type = ''
ca_size = 0
if 'ca_key_type' in hostkey_info:
ca_type = cast(str, hostkey_info['ca_key_type'])
if 'ca_key_size' in hostkey_info:
ca_size = cast(int, hostkey_info['ca_key_size'])
if algorithm in HostKeyTest.RSA_FAMILY or algorithm.startswith('ssh-rsa-cert-v0'):
entry['keysize'] = hostkey_size
if ca_size > 0:
entry['ca_algorithm'] = ca_type
entry['casize'] = ca_size