Fix compatibility issue, again.

Author: usualoma

CHANGELOG.md

@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.3.2] - 2023-07-18
+
+### Fixed
+
+* Fix compatibility issue, again.
+
 ## [2.3.1] - 2023-07-18
 
 ### Fixed

bin/setup-environment

@@ -42,6 +42,24 @@ my $workspace = {
     settings => {},
 };
 
+sub _check_integrity {
+    my ($integrity, $file_or_content) = @_;
+
+    my ($algorithm) = $integrity =~ m{\Asha(\d+)};
+    my $sha = Digest::SHA->new($algorithm);
+    if (ref $file_or_content) {
+
+        $sha->addfile($file_or_content);
+    } else {
+        $sha->add($file_or_content);
+    }
+    my $digest = $sha->b64digest;
+    $digest .= ('=' x ((4 - (length($digest) % 4)) % 4));
+    my $file_integrity = "sha256-" . $digest;
+
+    return $integrity eq ("sha$algorithm-" . $digest);
+}
+
 sub handle_recipe {
     my $data = shift;
 
@@ -70,28 +88,17 @@ sub handle_recipe {
             my $rel_path  = catfile($k,           $basename);
             my $full_path = catfile($archive_dir, $rel_path);
 
-            my ($algorithm) = $integrity =~ m{\Asha(\d+)};
-            my $sha = Digest::SHA->new($algorithm);
-
-            if (-f $full_path) {
-                $sha->addfile(IO::File->new($full_path, 'r'));
-                my $digest = $sha->b64digest;
-                $digest .= ('=' x ((4 - (length($digest) % 4)) % 4));
-                my $file_integrity = "sha$algorithm-" . $digest;
-                if ($file_integrity eq $integrity) {
-                    $archives .= " $rel_path";
-                    next;
-                }
+            if (-f $full_path && _check_integrity($integrity, IO::File->new($full_path, 'r'))) {
+                $archives .= " $rel_path";
+                next;
             }
 
             mkpath(dirname($full_path));
             my $response = HTTP::Tiny->new->get($url);
             die "Failed: @{[Dumper($response)]}"
                 unless $response->{success} && length $response->{content};
 
-            $sha->add($response->{content});
-            my $digest = "sha$algorithm-" . $sha->base64_padded_digest;
-            if ($digest ne $integrity) {
+            if (!_check_integrity($integrity, $response->{content})) {
                 die "intergrity check failed: $url";
             }