Author: nbd Date: 2016-01-16 01:19:41 +0100 (Sat, 16 Jan 2016) New Revision: 48253
Modified: trunk/scripts/download.pl Log: scripts/download.pl: add SHA-256 support Signed-off-by: Felix Fietkau <[email protected]> Modified: trunk/scripts/download.pl =================================================================== --- trunk/scripts/download.pl 2016-01-15 20:27:32 UTC (rev 48252) +++ trunk/scripts/download.pl 2016-01-16 00:19:41 UTC (rev 48253) @@ -11,12 +11,12 @@ use File::Basename; use File::Copy; -@ARGV > 2 or die "Syntax: $0 <target dir> <filename> <md5sum> <url filename> [<mirror> ...]\n"; +@ARGV > 2 or die "Syntax: $0 <target dir> <filename> <hash> <url filename> [<mirror> ...]\n"; my $url_filename; my $target = shift @ARGV; my $filename = shift @ARGV; -my $md5sum = shift @ARGV; +my $file_hash = shift @ARGV; $url_filename = shift @ARGV unless $ARGV[0] =~ /:\/\//; my $scriptdir = dirname($0); my @mirrors; @@ -59,9 +59,21 @@ return $res; } -my $md5cmd = which("md5sum") || which("md5") || die 'no md5 checksum program found, please install md5 or md5sum'; -chomp $md5cmd; +sub hash_cmd() { + my $len = length($file_hash); + my $cmd; + $len == 64 and return "openssl dgst -sha256"; + $len == 32 and do { + my $cmd = which("md5sum") || which("md5") || die 'no md5 checksum program found, please install md5 or md5sum'; + chomp $cmd; + return $cmd; + }; + return undef; +} + +my $hash_cmd = hash_cmd(); + sub download { my $mirror = shift; @@ -105,20 +117,24 @@ print("Copying $filename from $link\n"); copy($link, "$target/$filename.dl"); - if (system("$md5cmd '$target/$filename.dl' > '$target/$filename.md5sum'")) { - print("Failed to generate md5 sum for $filename\n"); - return; - } + $hash_cmd and do { + if (system("$hash_cmd '$target/$filename.dl' > '$target/$filename.hash'")) { + print("Failed to generate hash for $filename\n"); + return; + } + }; } else { open WGET, "wget -t5 --timeout=20 --no-check-certificate $options -O- '$mirror/$url_filename' |" or die "Cannot launch wget.\n"; - open MD5SUM, "| $md5cmd > '$target/$filename.md5sum'" or die "Cannot launch md5sum.\n"; + $hash_cmd and do { + open MD5SUM, "| $hash_cmd > '$target/$filename.hash'" or die "Cannot launch $hash_cmd.\n"; + }; open OUTPUT, "> $target/$filename.dl" or die "Cannot create file $target/$filename.dl: $!\n"; my $buffer; while (read WGET, $buffer, 1048576) { - print MD5SUM $buffer; + $hash_cmd and print MD5SUM $buffer; print OUTPUT $buffer; } - close MD5SUM; + $hash_cmd and close MD5SUM; close WGET; close OUTPUT; @@ -129,15 +145,17 @@ } } - my $sum = `cat "$target/$filename.md5sum"`; - $sum =~ /^(\w+)\s*/ or die "Could not generate md5sum\n"; - $sum = $1; + $hash_cmd and do { + my $sum = `cat "$target/$filename.hash"`; + $sum =~ /^(\w+)\s*/ or die "Could not generate file hash\n"; + $sum = $1; - if (($md5sum =~ /\w{32}/) and ($sum ne $md5sum)) { - print STDERR "MD5 sum of the downloaded file does not match (file: $sum, requested: $md5sum) - deleting download.\n"; - cleanup(); - return; - } + if ($sum ne $file_hash) { + print STDERR "MD5 sum of the downloaded file does not match (file: $sum, requested: $file_hash) - deleting download.\n"; + cleanup(); + return; + } + }; unlink "$target/$filename"; system("mv", "$target/$filename.dl", "$target/$filename"); @@ -147,7 +165,7 @@ sub cleanup { unlink "$target/$filename.dl"; - unlink "$target/$filename.md5sum"; + unlink "$target/$filename.hash"; } @mirrors = localmirrors(); _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
