From 79be6db38a10882e7a10c48a5b1de42ef6636adf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Wed, 24 Aug 2016 12:27:41 +0200 Subject: [PATCH] aplinfo: use fh for both digests for consistency, because Digest::MD5 cannot handle filenames directly.. --- PVE/API2/Nodes.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/PVE/API2/Nodes.pm b/PVE/API2/Nodes.pm index 5c0f6fad..96cec229 100644 --- a/PVE/API2/Nodes.pm +++ b/PVE/API2/Nodes.pm @@ -1114,17 +1114,17 @@ __PACKAGE__->register_method({ my $expected; eval { + open(my $fh, '<', $filename) or die "Can't open '$filename': $!"; + binmode($fh); if ($expected = $template_info->{sha512sum}) { - $digest = Digest::SHA->new(512)->addfile($filename, "b")->hexdigest; + $digest = Digest::SHA->new(512)->addfile($fh)->hexdigest; } elsif ($expected = $template_info->{md5sum}) { #fallback to MD5 - open (my $fh, '<', $filename) or die "Can't open '$filename': $!"; - binmode ($fh); $digest = Digest::MD5->new->addfile($fh)->hexdigest; - close($fh); } else { die "no expected checksum defined"; } + close($fh); }; die "checking hash failed - $@\n" if $@ && !$noerr;