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

Change source stamp verifier outcome

Browse Source 
Modify source stamp verifier to produce non-present stamps when
receiving an error while reading the stamp file in an APK.

Bug: 148005911
Test: atest FrameworksCoreTests:SourceStampVerifierTest
Change-Id: I7682f51761e60b4236424cf2cdb6119f53259ab0
This commit is contained in:
Khaled Abdelmohsen
2020-03-12 20:18:51 +00:00
parent f9fe6f87a9
commit 39bad6c991
1 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,25 +82,34 @@ public abstract class SourceStampVerifier {
public static SourceStampVerificationResult verify(String apkFile) {
try (RandomAccessFile apk = new RandomAccessFile(apkFile, "r")) {
return verify(apk);
} catch (Exception e) {
// Any exception in the SourceStamp verification returns a non-verified SourceStamp
// outcome without affecting the outcome of any of the other signature schemes.
return SourceStampVerificationResult.notVerified();
} catch (IOException e) {
// Any exception in reading the APK returns a non-present SourceStamp outcome
// without affecting the outcome of any of the other signature schemes.
return SourceStampVerificationResult.notPresent();
}
}
private static SourceStampVerificationResult verify(RandomAccessFile apk)
throws IOException, SignatureNotFoundException {
byte[] sourceStampCertificateDigest = getSourceStampCertificateDigest(apk);
if (sourceStampCertificateDigest == null) {
// SourceStamp certificate hash file not found, which means that there is not
// SourceStamp present.
private static SourceStampVerificationResult verify(RandomAccessFile apk) {
byte[] sourceStampCertificateDigest;
try {
sourceStampCertificateDigest = getSourceStampCertificateDigest(apk);
if (sourceStampCertificateDigest == null) {
// SourceStamp certificate hash file not found, which means that there is not
// SourceStamp present.
return SourceStampVerificationResult.notPresent();
}
} catch (IOException e) {
return SourceStampVerificationResult.notPresent();
}
SignatureInfo signatureInfo =
ApkSigningBlockUtils.findSignature(apk, SOURCE_STAMP_BLOCK_ID);
Map<Integer, byte[]> apkContentDigests = getApkContentDigests(apk);
return verify(signatureInfo, apkContentDigests, sourceStampCertificateDigest);
try {
SignatureInfo signatureInfo =
ApkSigningBlockUtils.findSignature(apk, SOURCE_STAMP_BLOCK_ID);
Map<Integer, byte[]> apkContentDigests = getApkContentDigests(apk);
return verify(signatureInfo, apkContentDigests, sourceStampCertificateDigest);
} catch (IOException | SignatureNotFoundException e) {
return SourceStampVerificationResult.notVerified();
}
}
private static SourceStampVerificationResult verify(