Fix Q1 hash generation

The base64 method of the Digest modules do not add padding
openSUSE · Jan 16, 2025 · e6ca02c · e6ca02c
1 parent d4287db
commit e6ca02c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Build/Apk.pm b/Build/Apk.pm
@@ -655,7 +655,7 @@ sub calcapkchksum {
     $ctx->addfile($fd);
   }
   return $ctx if $type eq 'raw';
-  return $type.$ctx->b64digest() if $type eq 'Q1' || $type eq 'Q2';
+  return $type.$ctx->b64digest().($type eq 'Q1' ? '=' : '') if $type eq 'Q1' || $type eq 'Q2';
   return $type.$ctx->hexdigest() if $type eq 'X1' || $type eq 'X2';
   return $ctx->hexdigest();
 }

diff --git a/Build/Apkv3.pm b/Build/Apkv3.pm
@@ -442,7 +442,7 @@ sub trunc_apkchksum {
 sub calcapkchksum_adb {
   my ($type) = $_[1];
   die("unsupported apkchksum type $type\n") unless $type eq 'Q1' || $type eq 'Q2' || $type eq 'X1' || $type eq 'X2' || $type eq 'md5';
-  return 'Q1'.Digest::SHA::sha1_base64($_[0]) if $type eq 'Q1';
+  return 'Q1'.Digest::SHA::sha1_base64($_[0]).'=' if $type eq 'Q1';
   return 'Q2'.Digest::SHA::sha256_base64($_[0]) if $type eq 'Q2';
   return 'X1'.Digest::SHA::sha1_hex($_[0]) if $type eq 'X1';
   return 'X2'.Digest::SHA::sha256_hex($_[0]) if $type eq 'X2';