Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Restore V2+ signature requirement for system apps" into tm-dev am: a347b6c2e6

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416120

Change-Id: I917fbefa7ecd6ef2fdbf8e7610569fcdf5c04a95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-04-29 16:56:31 +00:00
committed by Automerger Merge Worker
parent 70429b136e a347b6c2e6
commit 8aa6d20125
4 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/content/pm/PackageParser.java
View File

@@ -1414,11 +1414,9 @@ public class PackageParser {
final ParseTypeImpl input = ParseTypeImpl.forDefaultParsing();
final ParseResult<android.content.pm.SigningDetails> result;
if (skipVerify) {
// systemDir APKs are already trusted, save time by not verifying; since the signature
// is not verified and some system apps can have their V2+ signatures stripped allow
// pulling the certs from the jar signature.
// systemDir APKs are already trusted, save time by not verifying
result = ApkSignatureVerifier.unsafeGetCertsWithoutVerification(
input, apkPath, SigningDetails.SignatureSchemeVersion.JAR);
input, apkPath, minSignatureScheme);
} else {
result = ApkSignatureVerifier.verify(input, apkPath, minSignatureScheme);
}

4
services/core/java/com/android/server/pm/InstallPackageHelper.java
View File

@@ -4187,8 +4187,8 @@ final class InstallPackageHelper {
assertOverlayIsValid(pkg, parseFlags, scanFlags);
}
// If the package is not on a system partition ensure it is signed with at least the
// minimum signature scheme version required for its target SDK.
// Ensure the package is signed with at least the minimum signature scheme version
// required for its target SDK.
ScanPackageUtils.assertMinSignatureSchemeIsValid(pkg, parseFlags);
}
}

18
services/core/java/com/android/server/pm/ScanPackageUtils.java
View File

@@ -690,16 +690,14 @@ final class ScanPackageUtils {
public static void assertMinSignatureSchemeIsValid(AndroidPackage pkg,
@ParsingPackageUtils.ParseFlags int parseFlags) throws PackageManagerException {
if ((parseFlags & ParsingPackageUtils.PARSE_IS_SYSTEM_DIR) == 0) {
int minSignatureSchemeVersion =
ApkSignatureVerifier.getMinimumSignatureSchemeVersionForTargetSdk(
pkg.getTargetSdkVersion());
if (pkg.getSigningDetails().getSignatureSchemeVersion()
< minSignatureSchemeVersion) {
throw new PackageManagerException(INSTALL_PARSE_FAILED_NO_CERTIFICATES,
"No signature found in package of version " + minSignatureSchemeVersion
+ " or newer for package " + pkg.getPackageName());
}
int minSignatureSchemeVersion =
ApkSignatureVerifier.getMinimumSignatureSchemeVersionForTargetSdk(
pkg.getTargetSdkVersion());
if (pkg.getSigningDetails().getSignatureSchemeVersion()
< minSignatureSchemeVersion) {
throw new PackageManagerException(INSTALL_PARSE_FAILED_NO_CERTIFICATES,
"No signature found in package of version " + minSignatureSchemeVersion
+ " or newer for package " + pkg.getPackageName());
}
}

6
services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageUtils.java
View File

@@ -3105,11 +3105,9 @@ public class ParsingPackageUtils {
}
final ParseResult<SigningDetails> verified;
if (skipVerify) {
// systemDir APKs are already trusted, save time by not verifying; since the
// signature is not verified and some system apps can have their V2+ signatures
// stripped allow pulling the certs from the jar signature.
// systemDir APKs are already trusted, save time by not verifying
verified = ApkSignatureVerifier.unsafeGetCertsWithoutVerification(input, baseCodePath,
SigningDetails.SignatureSchemeVersion.JAR);
minSignatureScheme);
} else {
verified = ApkSignatureVerifier.verify(input, baseCodePath, minSignatureScheme);
}