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

Merge "SourceStampVerification Return more specific error code when verification fails" am: 037244751d am: 0c5d49cdbe am: e0874198f2

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

Change-Id: Ibf9b4878569d5bfd88607497f75dc14357026e9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-06-23 03:28:59 +00:00
committed by Automerger Merge Worker
parent 9deecc0150 e0874198f2
commit bef81fb864
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/util/apk/SourceStampVerifier.java
View File

@@ -142,16 +142,21 @@ public abstract class SourceStampVerifier {
private static SourceStampVerificationResult verify( private static SourceStampVerificationResult verify(
RandomAccessFile apk, byte[] sourceStampCertificateDigest, byte[] manifestBytes) { RandomAccessFile apk, byte[] sourceStampCertificateDigest, byte[] manifestBytes) {
SignatureInfo signatureInfo;
try { try {
SignatureInfo signatureInfo = signatureInfo =
ApkSigningBlockUtils.findSignature(apk, SOURCE_STAMP_BLOCK_ID); ApkSigningBlockUtils.findSignature(apk, SOURCE_STAMP_BLOCK_ID);
} catch (IOException | SignatureNotFoundException | RuntimeException e) {
return SourceStampVerificationResult.notPresent();
}
try {
Map<Integer, Map<Integer, byte[]>> signatureSchemeApkContentDigests = Map<Integer, Map<Integer, byte[]>> signatureSchemeApkContentDigests =
getSignatureSchemeApkContentDigests(apk, manifestBytes); getSignatureSchemeApkContentDigests(apk, manifestBytes);
return verify( return verify(
signatureInfo, signatureInfo,
getSignatureSchemeDigests(signatureSchemeApkContentDigests), getSignatureSchemeDigests(signatureSchemeApkContentDigests),
sourceStampCertificateDigest); sourceStampCertificateDigest);
} catch (IOException | SignatureNotFoundException | RuntimeException e) { } catch (IOException | RuntimeException e) {
return SourceStampVerificationResult.notVerified(); return SourceStampVerificationResult.notVerified();
} }
} }

2
core/tests/coretests/src/android/util/apk/SourceStampVerifierTest.java
View File

@@ -100,7 +100,7 @@ public class SourceStampVerifierTest {
SourceStampVerificationResult result = SourceStampVerificationResult result =
SourceStampVerifier.verify(mPrimaryApk.getAbsolutePath()); SourceStampVerifier.verify(mPrimaryApk.getAbsolutePath());
assertTrue(result.isPresent()); assertFalse(result.isPresent());
assertFalse(result.isVerified()); assertFalse(result.isVerified());
assertNull(result.getCertificate()); assertNull(result.getCertificate());
} }