diff --git a/aif/scripts/post/sshsecure.py b/aif/scripts/post/sshsecure.py index d2232df..a2b14ec 100644 --- a/aif/scripts/post/sshsecure.py +++ b/aif/scripts/post/sshsecure.py @@ -115,7 +115,10 @@ tstamp = int(datetime.datetime.utcnow().timestamp()) # nmap --script ssh2-enum-algos -PN -sV -p22 magic_ver = 6.5 ssh_ver = subprocess.run(['ssh', '-V'], stderr = subprocess.PIPE).stderr.decode('utf-8').strip().split()[0] -ssh_ver = float(re.sub('^(Open|Sun_)SSH_([0-9\.]+)(p[0-9]+)?,.*$', '\g<2>', ssh_ver)) +# FUCK YOU, DEBIAN. FUCK YOU AND ALL OF YOUR DERIVATIVES. YOU'RE FUCKING TRASH. +# YOU BELONG NOWHERE NEAR A DATACENTER. +#ssh_ver = float(re.sub('^(Open|Sun_)SSH_([0-9\.]+)(p[0-9]+)?,.*$', '\g<2>', ssh_ver)) +ssh_ver = float(re.sub('^(?:Open|Sun_)SSH_([0-9\.]+)(?:p[0-9]+)?(?:,|\s+).*$', '\g<1>', ssh_ver)) if ssh_ver >= magic_ver: has_ed25519 = True supported_keys = ('ed25519', 'rsa')