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

Commit aaa454ed authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[pm] Always load rotated certificates for v4 signature" into main

parents e8e8f93b 38a1934f

core/java/android/content/pm/flags.aconfig

+9 −0
Original line number Diff line number Diff line
@@ -391,3 +391,12 @@ flag { 
    bug: "319137634"

    is_fixed_read_only: true

}



flag {

    name: "always_load_past_certs_v4"

    is_exported: true

    namespace: "package_manager_service"

    description: "Always read the corresponding v3/3.1 signature block for the current v4 to get the past rotated certificates, even when not verifying integrity."

    bug: "378539511"

    is_fixed_read_only: true

}

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

+5 −3
Original line number Diff line number Diff line
@@ -260,9 +260,11 @@ public class ApkSignatureVerifier { 
            Certificate[][] nonstreamingCerts = null;



            int v3BlockId = APK_SIGNATURE_SCHEME_DEFAULT;

            // If V4 contains additional signing blocks then we need to always run v2/v3 verifier

            // to figure out which block they use.

            if (verifyFull || signingInfos.signingInfoBlocks.length > 0) {

            // We need to always run v2/v3 verifier to figure out which block they use so we can

            // return the past signers as well as the current one - the rotation chain is important

            // for many callers who verify the signature origin as well as the apk integrity.

            if (android.content.pm.Flags.alwaysLoadPastCertsV4()

                    || verifyFull || signingInfos.signingInfoBlocks.length > 0) {

                try {

                    // v4 is an add-on and requires v2 or v3 signature to validate against its

                    // certificate and digest