AIK: fix detecting AVBv2-signed bootimg

moetayuko · SebaUbuntu · commit b13ea8780b32 · 2025-01-02T19:10:14.000+01:00
diff --git a/authors.txt b/authors.txt
@@ -62,7 +62,7 @@ gzip, bzip2, lzop, xz;
 awk, basename, bash, cpio, cut, dd, dirname, env, file, find, grep, hexdump, java, printf, rev, sed, stat, sudo, tail, truncate, wc (Linux):
 (required system packages/commands)
 
-androidbootimg.magic:
+androidbootimg.magic, androidsign.magic:
 osm0sis @ xda-developers
 
 shell scripts:
diff --git a/bin/androidbootimg.magic b/bin/androidbootimg.magic
@@ -3,28 +3,6 @@
 # osm0sis @ xda-developers
 #------------------------------------------------------------------------------
 
-# ASUS Blob Signature
-0		string		-SIGNED-BY-SIGNBLOB-	BLOB signing
-
-# Barnes & Noble Nook Signature
-64		string		Red\x20Loader						NOOK signing (red loader)
-64		string		Green\x20Loader						NOOK signing (green loader)
-64		string		Green\x20Recovery					NOOK signing (green recovery)
-64		string		eMMC\x20boot.img+secondloader		NOOK signing (emmc boot)
-64		string		eMMC\x20recovery.img+secondloader	NOOK signing (emmc recovery)
-48		string		BauwksBoot							NOOKTAB signing (bauwks)
-
-# Google ChromeOS Signature
-0		string		CHROMEOS			CHROMEOS signing
-
-# Samsung/Spreadtrum DHTB Signature
-0		string		DHTB\x01\x00\x00	DHTB signing
-
-# Sony SIN Packaging/Signature
-0		string		\x01\x00\x00\x00	SINv1 signing
-0		string		\x02\x00\x00\x00	SINv2 signing
-0		string		\x03SIN				SINv3 signing
-
 # Google Pixel/Nexus/AOSP Standard
 # [test "x" as workaround to odd file/magic behavior not allowing search here]
 0		string		x
@@ -83,29 +61,3 @@
 # [for detection after boot image has already been split]
 0		string		QCDT				QCDT header
 !:strength / 20
-
-# Google Android Verified Boot 1.0 Signature
-# [for detection with the tail of the boot image]
-0		search		\x02\x01\x01\x30\x82	AVBv1 signing footer
->0		search		/boot					\b, boot type
->0		search		/recovery				\b, recovery type
-!:strength / 20
-
-# Google Android Verified Boot 2.0 Signature
-# [for detection with the tail of the boot image]
-# [test "x" as workaround to odd file/magic behavior not allowing search here]
-0		string		x
->0		search		AVBf					AVBv2 signing footer
-!:strength / 20
-
-# LG Bump
-# [for detection with the tail of the boot image]
-0		search		\x41\xA9\xE4\x67\x74\x4D\x1D\x1B\xA4\x29\xF2\xEC\xEA\x65\x52\x79	Bump footer
-!:strength / 20
-
-# Samsung SEAndroid
-# [for detection with the tail of the boot image]
-# [test "x" as workaround to odd file/magic behavior not allowing search here]
-0		string		x
->0		search		SEANDROIDENFORCE	SEAndroid footer
-!:strength / 20
diff --git a/bin/androidsign.magic b/bin/androidsign.magic
@@ -0,0 +1,52 @@
+#------------------------------------------------------------------------------
+# Various Android OEM non-standard boot image related magic entries
+# osm0sis @ xda-developers
+#------------------------------------------------------------------------------
+
+# ASUS Blob Signature
+0		string		-SIGNED-BY-SIGNBLOB-	BLOB signing
+
+# Barnes & Noble Nook Signature
+64		string		Red\x20Loader						NOOK signing (red loader)
+64		string		Green\x20Loader						NOOK signing (green loader)
+64		string		Green\x20Recovery					NOOK signing (green recovery)
+64		string		eMMC\x20boot.img+secondloader		NOOK signing (emmc boot)
+64		string		eMMC\x20recovery.img+secondloader	NOOK signing (emmc recovery)
+48		string		BauwksBoot							NOOKTAB signing (bauwks)
+
+# Google ChromeOS Signature
+0		string		CHROMEOS			CHROMEOS signing
+
+# Samsung/Spreadtrum DHTB Signature
+0		string		DHTB\x01\x00\x00	DHTB signing
+
+# Sony SIN Packaging/Signature
+0		string		\x01\x00\x00\x00	SINv1 signing
+0		string		\x02\x00\x00\x00	SINv2 signing
+0		string		\x03SIN				SINv3 signing
+
+# Google Android Verified Boot 1.0 Signature
+# [for detection with the tail of the boot image]
+0		search		\x02\x01\x01\x30\x82	AVBv1 signing footer
+>0		search		/boot					\b, boot type
+>0		search		/recovery				\b, recovery type
+!:strength / 20
+
+# Google Android Verified Boot 2.0 Signature
+# [for detection with the tail of the boot image]
+# [test "x" as workaround to odd file/magic behavior not allowing search here]
+0		string		x
+>0		search		AVBf					AVBv2 signing footer
+!:strength / 20
+
+# LG Bump
+# [for detection with the tail of the boot image]
+0		search		\x41\xA9\xE4\x67\x74\x4D\x1D\x1B\xA4\x29\xF2\xEC\xEA\x65\x52\x79	Bump footer
+!:strength / 20
+
+# Samsung SEAndroid
+# [for detection with the tail of the boot image]
+# [test "x" as workaround to odd file/magic behavior not allowing search here]
+0		string		x
+>0		search		SEANDROIDENFORCE	SEAndroid footer
+!:strength / 20
diff --git a/cleanup.sh b/cleanup.sh
@@ -24,7 +24,7 @@ case $1 in
 esac;
 
 chmod -R 755 "$bin" "$aik"/*.sh;
-chmod 644 "$bin/magic" "$bin/androidbootimg.magic" "$bin/boot_signer.jar" "$bin/avb/"* "$bin/chromeos/"*;
+chmod 644 "$bin/magic" "$bin/androidbootimg.magic" "$bin/androidsign.magic" "$bin/boot_signer.jar" "$bin/avb/"* "$bin/chromeos/"*;
 
 if [ -d ramdisk ] && [ "$(stat $statarg ramdisk | head -n 1)" = "root" -o ! "$(find ramdisk 2>&1 | cpio -o >/dev/null 2>&1; echo $?)" -eq "0" ]; then
   sudo=sudo;
diff --git a/repackimg.sh b/repackimg.sh
@@ -50,7 +50,7 @@ case $1 in
   *) cd "$aik";;
 esac;
 chmod -R 755 "$bin" "$aik/"*.sh;
-chmod 644 "$bin/magic" "$bin/androidbootimg.magic" "$bin/boot_signer.jar" "$bin/avb/"* "$bin/chromeos/"*;
+chmod 644 "$bin/magic" "$bin/androidbootimg.magic" "$bin/androidsign.magic" "$bin/boot_signer.jar" "$bin/avb/"* "$bin/chromeos/"*;
 
 if [ -z "$(ls split_img/* 2>/dev/null)" -o ! -e ramdisk ]; then
   echo "No files found to be packed/built.";
diff --git a/unpackimg.sh b/unpackimg.sh
@@ -54,7 +54,7 @@ if [ ! "$local" ]; then
   cd "$aik";
 fi;
 chmod -R 755 "$bin" "$aik"/*.sh;
-chmod 644 "$bin/magic" "$bin/androidbootimg.magic" "$bin/boot_signer.jar" "$bin/avb/"* "$bin/chromeos/"*;
+chmod 644 "$bin/magic" "$bin/androidbootimg.magic" "$bin/androidsign.magic" "$bin/boot_signer.jar" "$bin/avb/"* "$bin/chromeos/"*;
 
 img="$1";
 [ -f "$cur/$1" ] && img="$cur/$1";
@@ -100,7 +100,7 @@ mkdir split_img ramdisk;
 cd split_img;
 filesize=$(wc -c < "$img");
 echo "$filesize" > "$file-origsize";
-imgtest="$(file -m "$bin/androidbootimg.magic" "$img" 2>/dev/null | cut -d: -f2-)";
+imgtest="$(file -m "$bin/androidsign.magic" "$img" 2>/dev/null | cut -d: -f2-)";
 if [ "$(echo $imgtest | awk '{ print $2 }' | cut -d, -f1)" = "signing" ]; then
   echo $imgtest | awk '{ print $1 }' > "$file-sigtype";
   sigtype=$(cat "$file-sigtype");
@@ -128,7 +128,7 @@ if [ "$(echo $imgtest | awk '{ print $2 }' | cut -d, -f1)" = "signing" ]; then
       rm -f "$file-sigtype";
     ;;
   esac;
-  img="$file";
+  [ -f "$file" ] && img="$file";
 fi;
 
 imgtest="$(file -m "$bin/androidbootimg.magic" "$img" 2>/dev/null | cut -d: -f2-)";
@@ -182,9 +182,9 @@ case $(echo $imgtest | awk '{ print $3 }') in
   ;;
 esac;
 
-tailtest="$(dd if="$img" iflag=skip_bytes skip=$(($(wc -c < "$img") - 8192)) bs=8192 count=1 2>/dev/null | file -m $bin/androidbootimg.magic - 2>/dev/null | cut -d: -f2-)";
+tailtest="$(dd if="$img" iflag=skip_bytes skip=$(($(wc -c < "$img") - 8192)) bs=8192 count=1 2>/dev/null | file -m $bin/androidsign.magic - 2>/dev/null | cut -d: -f2-)";
 case $tailtest in
-  *data) tailtest="$(tail -n50 "$img" | file -m "$bin/androidbootimg.magic" - 2>/dev/null | cut -d: -f2-)";;
+  *data) tailtest="$(tail -n50 "$img" | file -m "$bin/androidsign.magic" - 2>/dev/null | cut -d: -f2-)";;
 esac;
 tailtype="$(echo $tailtest | awk '{ print $1 }')";
 case $tailtype in
