Output SSH1 host-key algorithm.

This commit is contained in:
Andris Raugulis 2016-09-17 20:21:18 +03:00
parent b16ef4d040
commit a70b93862a

View File

@ -220,6 +220,9 @@ class SSH1(object):
TEXT_CIPHER_IDEA = 'cipher used by commercial SSH' TEXT_CIPHER_IDEA = 'cipher used by commercial SSH'
ALGORITHMS = { ALGORITHMS = {
'key': {
'ssh-rsa1': [['1.2.2']],
},
'enc': { 'enc': {
'none': [['1.2.2'], [FAIL_PLAINTEXT]], 'none': [['1.2.2'], [FAIL_PLAINTEXT]],
'idea': [[None], [], [], [TEXT_CIPHER_IDEA]], 'idea': [[None], [], [], [TEXT_CIPHER_IDEA]],
@ -1167,7 +1170,8 @@ def output_compatibility(kex, pkm, for_server=True):
alg_pairs = [] alg_pairs = []
if pkm is not None: if pkm is not None:
alg_pairs.append((SSH1.KexDB.ALGORITHMS, alg_pairs.append((SSH1.KexDB.ALGORITHMS,
{'enc': pkm.supported_ciphers, {'key': ['ssh-rsa1'],
'enc': pkm.supported_ciphers,
'aut': pkm.supported_authentications})) 'aut': pkm.supported_authentications}))
if kex is not None: if kex is not None:
alg_pairs.append((KexDB.ALGORITHMS, alg_pairs.append((KexDB.ALGORITHMS,
@ -1269,6 +1273,8 @@ def output(banner, header, kex=None, pkm=None):
alg_db = SSH1.KexDB.ALGORITHMS alg_db = SSH1.KexDB.ALGORITHMS
ciphers = pkm.supported_ciphers ciphers = pkm.supported_ciphers
auths = pkm.supported_authentications auths = pkm.supported_authentications
title, alg_type = 'SSH1 host-key algorithms', 'key'
output_algorithms(title, alg_db, alg_type, ['ssh-rsa1'], maxlen)
title, alg_type = 'SSH1 encryption algorithms (ciphers)', 'enc' title, alg_type = 'SSH1 encryption algorithms (ciphers)', 'enc'
output_algorithms(title, alg_db, alg_type, ciphers, maxlen) output_algorithms(title, alg_db, alg_type, ciphers, maxlen)
title, alg_type = 'SSH1 authentication types', 'aut' title, alg_type = 'SSH1 authentication types', 'aut'