Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed521ab2 authored by Gavin Corkery's avatar Gavin Corkery
Browse files

Renaming plsCertsNoVerifyOnlyCerts to unsafeGetCertsWithoutVerification. 

Bug: 118866213
Test: m -j
Change-Id: Iba5e933b7db8dd36d5c720dba128cdce7d76e6d5
parent 9c9b866e

config/boot-image-profile.txt

+1 −1
Original line number Diff line number Diff line
@@ -32559,7 +32559,7 @@ HSPLandroid/util/apk/ApkSignatureSchemeV3Verifier;->verify(Ljava/io/RandomAccess 
HSPLandroid/util/apk/ApkSignatureSchemeV3Verifier;->verify(Ljava/lang/String;Z)Landroid/util/apk/ApkSignatureSchemeV3Verifier$VerifiedSigner;

HSPLandroid/util/apk/ApkSignatureSchemeV3Verifier;->verifyAdditionalAttributes(Ljava/nio/ByteBuffer;Ljava/util/List;Ljava/security/cert/CertificateFactory;)Landroid/util/apk/ApkSignatureSchemeV3Verifier$VerifiedSigner;

HSPLandroid/util/apk/ApkSignatureSchemeV3Verifier;->verifySigner(Ljava/nio/ByteBuffer;Ljava/util/Map;Ljava/security/cert/CertificateFactory;)Landroid/util/apk/ApkSignatureSchemeV3Verifier$VerifiedSigner;

HSPLandroid/util/apk/ApkSignatureVerifier;->plsCertsNoVerifyOnlyCerts(Ljava/lang/String;I)Landroid/content/pm/PackageParser$SigningDetails;

HSPLandroid/util/apk/ApkSignatureVerifier;->unsafeGetCertsWithoutVerification(Ljava/lang/String;I)Landroid/content/pm/PackageParser$SigningDetails;

HSPLandroid/util/apk/ApkSigningBlockUtils;->compareContentDigestAlgorithm(II)I

HSPLandroid/util/apk/ApkSigningBlockUtils;->compareSignatureAlgorithm(II)I

HSPLandroid/util/apk/ApkSigningBlockUtils;->findApkSignatureSchemeBlock(Ljava/nio/ByteBuffer;I)Ljava/nio/ByteBuffer;

core/java/android/content/pm/PackageParser.java

+1 −1
Original line number Diff line number Diff line
@@ -1533,7 +1533,7 @@ public class PackageParser { 
        SigningDetails verified;

        if (skipVerify) {

            // systemDir APKs are already trusted, save time by not verifying

            verified = ApkSignatureVerifier.plsCertsNoVerifyOnlyCerts(

            verified = ApkSignatureVerifier.unsafeGetCertsWithoutVerification(

                        apkPath, minSignatureScheme);

        } else {

            verified = ApkSignatureVerifier.verify(apkPath, minSignatureScheme);

core/java/android/util/apk/ApkSignatureSchemeV2Verifier.java

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ public class ApkSignatureSchemeV2Verifier { 
     * @throws SignatureNotFoundException if the APK is not signed using APK Signature Scheme v2.

     * @throws IOException if an I/O error occurs while reading the APK file.

     */

    public static X509Certificate[][] plsCertsNoVerifyOnlyCerts(String apkFile)

    public static X509Certificate[][] unsafeGetCertsWithoutVerification(String apkFile)

            throws SignatureNotFoundException, SecurityException, IOException {

        VerifiedSigner vSigner = verify(apkFile, false);

        return vSigner.certs;

core/java/android/util/apk/ApkSignatureSchemeV3Verifier.java

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ public class ApkSignatureSchemeV3Verifier { 
     * @throws SignatureNotFoundException if the APK is not signed using APK Signature Scheme v3.

     * @throws IOException if an I/O error occurs while reading the APK file.

     */

    public static VerifiedSigner plsCertsNoVerifyOnlyCerts(String apkFile)

    public static VerifiedSigner unsafeGetCertsWithoutVerification(String apkFile)

            throws SignatureNotFoundException, SecurityException, IOException {

        return verify(apkFile, false);

    }

core/java/android/util/apk/ApkSignatureVerifier.java

+3 −3
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ public class ApkSignatureVerifier { 
     * @throws PackageParserException if the APK's signature failed to verify.

     * or greater is not found, except in the case of no JAR signature.

     */

    public static PackageParser.SigningDetails plsCertsNoVerifyOnlyCerts(

    public static PackageParser.SigningDetails unsafeGetCertsWithoutVerification(

            String apkPath, int minSignatureSchemeVersion)

            throws PackageParserException {
@@ -317,7 +317,7 @@ public class ApkSignatureVerifier { 
        Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "certsOnlyV3");

        try {

            ApkSignatureSchemeV3Verifier.VerifiedSigner vSigner =

                    ApkSignatureSchemeV3Verifier.plsCertsNoVerifyOnlyCerts(apkPath);

                    ApkSignatureSchemeV3Verifier.unsafeGetCertsWithoutVerification(apkPath);

            Certificate[][] signerCerts = new Certificate[][] { vSigner.certs };

            Signature[] signerSigs = convertToSignatures(signerCerts);

            Signature[] pastSignerSigs = null;
@@ -359,7 +359,7 @@ public class ApkSignatureVerifier { 
        Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "certsOnlyV2");

        try {

            Certificate[][] signerCerts =

                    ApkSignatureSchemeV2Verifier.plsCertsNoVerifyOnlyCerts(apkPath);

                    ApkSignatureSchemeV2Verifier.unsafeGetCertsWithoutVerification(apkPath);

            Signature[] signerSigs = convertToSignatures(signerCerts);

            return new PackageParser.SigningDetails(signerSigs,

                    SignatureSchemeVersion.SIGNING_BLOCK_V2);