From bc77a52b60273aa7b4c1e4d4e4e3cda318fddf1f Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Mon, 24 Jul 2017 10:49:59 +0200 Subject: [PATCH] fix #1253: show ssh key fingerprints again ssh-keygen's fingerprint output has changed --- src/PVE/LXC/Setup.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/PVE/LXC/Setup.pm b/src/PVE/LXC/Setup.pm index a32eb86..d65685c 100644 --- a/src/PVE/LXC/Setup.pm +++ b/src/PVE/LXC/Setup.pm @@ -223,7 +223,8 @@ sub rewrite_ssh_host_keys { my $line = shift; print "done: $line\n" - if ($line =~ m/^([0-9a-f]{2}:)+[0-9a-f]{2}\s+\Q$ssh_comment\E$/i); + if $line =~ m/^(?:[0-9a-f]{2}:)+[0-9a-f]{2}\s+\Q$ssh_comment\E$/i || + $line =~ m/^SHA256:[0-9a-z+\/]{43}\s+\Q$ssh_comment\E$/i; }; # Create temporary keys in /tmp on the host @@ -233,7 +234,7 @@ sub rewrite_ssh_host_keys { my $file = "/tmp/$$.$basename"; print "Creating SSH host key '$basename' - this may take some time ...\n"; my $cmd = ['ssh-keygen', '-f', $file, '-t', $keytype, - '-N', '', '-C', $ssh_comment]; + '-N', '', '-E', 'sha256', '-C', $ssh_comment]; PVE::Tools::run_command($cmd, outfunc => $keygen_outfunc); $keyfiles->{"/etc/ssh/$basename"} = [PVE::Tools::file_get_contents($file), 0600]; $keyfiles->{"/etc/ssh/$basename.pub"} = [PVE::Tools::file_get_contents("$file.pub"), 0644]; -- 2.39.2