From aa0a7e58370ffd303b218b3720e476eff4abcae2 Mon Sep 17 00:00:00 2001 From: brent s Date: Wed, 12 Oct 2022 16:07:42 -0400 Subject: [PATCH] lol fixing the Debian fuckery fix --- aif/scripts/post/sshsecure.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/aif/scripts/post/sshsecure.py b/aif/scripts/post/sshsecure.py index a2b14ec..5fd149a 100644 --- a/aif/scripts/post/sshsecure.py +++ b/aif/scripts/post/sshsecure.py @@ -117,8 +117,7 @@ magic_ver = 6.5 ssh_ver = subprocess.run(['ssh', '-V'], stderr = subprocess.PIPE).stderr.decode('utf-8').strip().split()[0] # 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)) +ssh_ver = float(re.sub('^(?:Open|Sun_)SSH_([0-9\.]+)(?:p[0-9]+)?(?:,.*)?.*$', '\g<1>', ssh_ver)) if ssh_ver >= magic_ver: has_ed25519 = True supported_keys = ('ed25519', 'rsa')