| ... |
... |
@@ -23,7 +23,7 @@ check_installed_packages() { |
|
23
|
23
|
}
|
|
24
|
24
|
|
|
25
|
25
|
setup_build_tools() {
|
|
26
|
|
- abt_version=16
|
|
|
26
|
+ abt_version='37.0'
|
|
27
|
27
|
build_tools_dir=/signing/android-build-tools
|
|
28
|
28
|
test -f "$build_tools_dir"/android-$abt_version/apksigner || \
|
|
29
|
29
|
exit_error "$build_tools_dir/android-$abt_version/apksigner is missing"
|
| ... |
... |
@@ -40,15 +40,15 @@ verify_apk() { |
|
40
|
40
|
scheme_v3="Verified using v3 scheme (APK Signature Scheme v3): true"
|
|
41
|
41
|
|
|
42
|
42
|
if test "$tbb_version_type" = "alpha"; then
|
|
43
|
|
- cert_digest="Signer #1 certificate SHA-256 digest: 15f760b41acbe4783e667102c9f67119be2af62fab07763f9d57f01e5e1074e1"
|
|
44
|
|
- pubkey_digest="Signer #1 public key SHA-256 digest: 4e617e6516f81123ca58e718d617a704ac8365c575bd9e7a731ba5dd0476869d"
|
|
|
43
|
+ cert_digest="V3.0 Signer: certificate SHA-256 digest: 15f760b41acbe4783e667102c9f67119be2af62fab07763f9d57f01e5e1074e1"
|
|
|
44
|
+ pubkey_digest="V3.0 Signer: public key SHA-256 digest: 4e617e6516f81123ca58e718d617a704ac8365c575bd9e7a731ba5dd0476869d"
|
|
45
|
45
|
else
|
|
46
|
|
- cert_digest="Signer #1 certificate SHA-256 digest: 20061f045e737c67375c17794cfedb436a03cec6bacb7cb9f96642205ca2cec8"
|
|
47
|
|
- pubkey_digest="Signer #1 public key SHA-256 digest: 343ca8a2e5452670bdc335a181a4baed909f868937d68c4653e44ef84de8dfc6"
|
|
|
46
|
+ cert_digest="V3.0 Signer: certificate SHA-256 digest: 20061f045e737c67375c17794cfedb436a03cec6bacb7cb9f96642205ca2cec8"
|
|
|
47
|
+ pubkey_digest="V3.0 Signer: public key SHA-256 digest: 343ca8a2e5452670bdc335a181a4baed909f868937d68c4653e44ef84de8dfc6"
|
|
48
|
48
|
fi
|
|
49
|
49
|
if test "$SIGNING_PROJECTNAME" = "torvpn"; then
|
|
50
|
|
- cert_digest="Signer #1 certificate SHA-256 digest: c2f6ffa30e56a7c53a226248ef908612ee539df2f52bede5a55037425b83331d"
|
|
51
|
|
- pubkey_digest="Signer #1 public key SHA-256 digest: fddc5f93ae0bc971e951481b0b5e6b62e47040fe979ff535cf75daade2f13f3d"
|
|
|
50
|
+ cert_digest="V3.0 Signer: certificate SHA-256 digest: c2f6ffa30e56a7c53a226248ef908612ee539df2f52bede5a55037425b83331d"
|
|
|
51
|
+ pubkey_digest="V3.0 Signer: public key SHA-256 digest: fddc5f93ae0bc971e951481b0b5e6b62e47040fe979ff535cf75daade2f13f3d"
|
|
52
|
52
|
fi
|
|
53
|
53
|
for digest in "${scheme_v2}" "${scheme_v3}" "${cert_digest}" "${pubkey_digest}"; do
|
|
54
|
54
|
test -z "$digest" && continue
|