proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-12 09:50:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

aplinfo: use fh for both digests

Browse Source 
for consistency, because Digest::MD5 cannot handle filenames directly..
This commit is contained in:
Fabian Grünbichler 2016-08-24 12:27:41 +02:00 committed by Dietmar Maurer
parent 4661648a14
commit 79be6db38a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PVE/API2/Nodes.pm
View File

@ -1114,17 +1114,17 @@ __PACKAGE__->register_method({
my $expected; my $expected;
eval { eval {
open(my $fh, '<', $filename) or die "Can't open '$filename': $!";
binmode($fh);
if ($expected = $template_info->{sha512sum}) { 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}) { } elsif ($expected = $template_info->{md5sum}) {
#fallback to MD5 #fallback to MD5
open (my $fh, '<', $filename) or die "Can't open '$filename': $!";
binmode ($fh);
$digest = Digest::MD5->new->addfile($fh)->hexdigest; $digest = Digest::MD5->new->addfile($fh)->hexdigest;
close($fh);
} else { } else {
die "no expected checksum defined"; die "no expected checksum defined";
} }
close($fh);
}; };
die "checking hash failed - $@\n" if $@ && !$noerr; die "checking hash failed - $@\n" if $@ && !$noerr;