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

Merge "Revert "[automerge] [DO NOT MERGE]Revert "Relax minimum signatur..."" into sc-v2-dev-plus-aosp

Browse Source
This commit is contained in:
Michael Groover
2022-03-08 00:42:19 +00:00
committed by Android (Google) Code Review
parent abee835c34 26e383f664
commit a64720dab3
3 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1401,9 +1401,11 @@ public class PackageParser {
} }
SigningDetails verified; SigningDetails verified;
if (skipVerify) { if (skipVerify) {
// systemDir APKs are already trusted, save time by not verifying // 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.
verified = ApkSignatureVerifier.unsafeGetCertsWithoutVerification( verified = ApkSignatureVerifier.unsafeGetCertsWithoutVerification(
apkPath, minSignatureScheme); apkPath, SigningDetails.SignatureSchemeVersion.JAR);
} else { } else {
verified = ApkSignatureVerifier.verify(apkPath, minSignatureScheme); verified = ApkSignatureVerifier.verify(apkPath, minSignatureScheme);
} }

6
core/java/android/content/pm/parsing/ParsingPackageUtils.java
View File

@@ -3038,9 +3038,11 @@ public class ParsingPackageUtils {
SigningDetails verified; SigningDetails verified;
try { try {
if (skipVerify) { if (skipVerify) {
// systemDir APKs are already trusted, save time by not verifying // 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.
verified = ApkSignatureVerifier.unsafeGetCertsWithoutVerification( verified = ApkSignatureVerifier.unsafeGetCertsWithoutVerification(
baseCodePath, minSignatureScheme); baseCodePath, SigningDetails.SignatureSchemeVersion.JAR);
} else { } else {
verified = ApkSignatureVerifier.verify(baseCodePath, minSignatureScheme); verified = ApkSignatureVerifier.verify(baseCodePath, minSignatureScheme);
} }

6
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -15176,8 +15176,9 @@ public class PackageManagerService extends IPackageManager.Stub
} }
} }
// Ensure the package is signed with at least the minimum signature scheme version // If the package is not on a system partition ensure it is signed with at least the
// required for its target SDK. // minimum signature scheme version required for its target SDK.
if ((parseFlags & ParsingPackageUtils.PARSE_IS_SYSTEM_DIR) == 0) {
int minSignatureSchemeVersion = int minSignatureSchemeVersion =
ApkSignatureVerifier.getMinimumSignatureSchemeVersionForTargetSdk( ApkSignatureVerifier.getMinimumSignatureSchemeVersionForTargetSdk(
pkg.getTargetSdkVersion()); pkg.getTargetSdkVersion());
@@ -15188,6 +15189,7 @@ public class PackageManagerService extends IPackageManager.Stub
} }
} }
} }
}
@GuardedBy("mLock") @GuardedBy("mLock")
private boolean addBuiltInSharedLibraryLocked(SystemConfig.SharedLibraryEntry entry) { private boolean addBuiltInSharedLibraryLocked(SystemConfig.SharedLibraryEntry entry) {