Handle base-16 NarHash fields in signed .narinfo files

1 files changed, 5 insertions, 2 deletions

diff --git a/perl/lib/Nix/Manifest.pm b/perl/lib/Nix/Manifest.pm
index fb4a46469a09..428decf09b54 100644
--- a/perl/lib/Nix/Manifest.pm
+++ b/perl/lib/Nix/Manifest.pm
@@ -395,12 +395,15 @@ sub deleteOldManifests {
 
 
 # Return a fingerprint of a store path to be used in binary cache
-# signatures. It contains the store path, the SHA-256 hash of the
-# contents of the path, and the references.
+# signatures. It contains the store path, the base-32 SHA-256 hash of
+# the contents of the path, and the references.
 sub fingerprintPath {
     my ($storePath, $narHash, $narSize, $references) = @_;
     die if substr($storePath, 0, length($Nix::Config::storeDir)) ne $Nix::Config::storeDir;
     die if substr($narHash, 0, 7) ne "sha256:";
+    # Convert hash from base-16 to base-32, if necessary.
+    $narHash = "sha256:" . convertHash("sha256", substr($narHash, 7), 1)
+        if length($narHash) == 71;
     die if length($narHash) != 59;
     foreach my $ref (@{$references}) {
         die if substr($ref, 0, length($Nix::Config::storeDir)) ne $Nix::Config::storeDir;