Merge "SourceStampVerification Return more specific error code when verification fails" (03724475) · Commits · e / os / android_frameworks_base

core/java/android/util/apk/SourceStampVerifier.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -142,16 +142,21 @@ public abstract class SourceStampVerifier {

		private static SourceStampVerificationResult verify(
		RandomAccessFile apk, byte[] sourceStampCertificateDigest, byte[] manifestBytes) {
		SignatureInfo signatureInfo;
		try {
		SignatureInfo signatureInfo =
		signatureInfo =
		ApkSigningBlockUtils.findSignature(apk, SOURCE_STAMP_BLOCK_ID);
		} catch (IOException \| SignatureNotFoundException \| RuntimeException e) {
		return SourceStampVerificationResult.notPresent();
		}
		try {
		Map<Integer, Map<Integer, byte[]>> signatureSchemeApkContentDigests =
		getSignatureSchemeApkContentDigests(apk, manifestBytes);
		return verify(
		signatureInfo,
		getSignatureSchemeDigests(signatureSchemeApkContentDigests),
		sourceStampCertificateDigest);
		} catch (IOException \| SignatureNotFoundException \| RuntimeException e) {
		} catch (IOException \| RuntimeException e) {
		return SourceStampVerificationResult.notVerified();
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -100,7 +100,7 @@ public class SourceStampVerifierTest {
		SourceStampVerificationResult result =
		SourceStampVerifier.verify(mPrimaryApk.getAbsolutePath());

		assertTrue(result.isPresent());
		assertFalse(result.isPresent());
		assertFalse(result.isVerified());
		assertNull(result.getCertificate());
		}