mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-20 05:16:01 +00:00
sign-apk: match apksigner's 'V3.0 Signer:' lines too
This commit is contained in:
1 parent
c0a264564b
commit
709668a479
1 file changed
+3
-3
@@ -81,10 +81,10 @@ rm -f "$out.idsig"
|
||||
# (Listed first, then searched: grep -q stops reading early, which fails a pipe under pipefail.)
|
||||
listing=$(unzip -l "$out")
|
||||
grep -qE 'META-INF/.*\.(SF|RSA)$' <<<"$listing" || die "$variant: no JAR signature (old installers)"
|
||||
# Android 9+ must see our key and only our key. apksigner labels signers "Signer #1" or, in newer
|
||||
# build-tools, "Signer (minSdkVersion=28, ...)"; the digests are what count.
|
||||
# Android 9+ must see our key and only our key. apksigner labels signers "Signer #1", "Signer
|
||||
# (minSdkVersion=28, ...)" or "V3.0 Signer:" depending on its version; the digests are what count.
|
||||
certs=$("$BUILD_TOOLS/apksigner" verify --min-sdk-version 28 --print-certs "$out")
|
||||
v3=$(sed -n 's/^Signer.* certificate SHA-256 digest: //p' <<<"$certs" | sort -u)
|
||||
v3=$(sed -n 's/^.*Signer.* certificate SHA-256 digest: //p' <<<"$certs" | sort -u)
|
||||
if [ "$v3" != "$expected" ]; then
|
||||
echo "$certs" >&2
|
||||
die "$variant: Android 9+ sees signer(s) [$(tr '\n' ' ' <<<"$v3")], not only DroidDeck's key $expected"
|
||||
|
||||
Reference in new issue
Block a user