diff options
author | Gavin Corkery <gavincorkery@google.com> | 2019-01-31 16:59:41 +0000 |
---|---|---|
committer | Gavin Corkery <gavincorkery@google.com> | 2019-01-31 17:58:18 +0000 |
commit | ed521ab2a9d08a50cf5a88634981e4a1b0aaae65 (patch) | |
tree | ef0b8a5fd49386f9593a69b5e1f42c7796fb7433 | |
parent | 9c9b866e1fbb41112f47d5550c1d8482b31cb1bf (diff) |
Renaming plsCertsNoVerifyOnlyCerts to unsafeGetCertsWithoutVerification.
Bug: 118866213
Test: m -j
Change-Id: Iba5e933b7db8dd36d5c720dba128cdce7d76e6d5
6 files changed, 8 insertions, 8 deletions
diff --git a/config/boot-image-profile.txt b/config/boot-image-profile.txt index 7f4d1d0db5a2..6061b66a2ae8 100644 --- a/config/boot-image-profile.txt +++ b/config/boot-image-profile.txt @@ -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; diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index 1fab443629a4..645a61827811 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -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); diff --git a/core/java/android/util/apk/ApkSignatureSchemeV2Verifier.java b/core/java/android/util/apk/ApkSignatureSchemeV2Verifier.java index 1bbef8e9cfff..b36888e23f9c 100644 --- a/core/java/android/util/apk/ApkSignatureSchemeV2Verifier.java +++ b/core/java/android/util/apk/ApkSignatureSchemeV2Verifier.java @@ -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; diff --git a/core/java/android/util/apk/ApkSignatureSchemeV3Verifier.java b/core/java/android/util/apk/ApkSignatureSchemeV3Verifier.java index 1471870bd7d2..602e6df3e34f 100644 --- a/core/java/android/util/apk/ApkSignatureSchemeV3Verifier.java +++ b/core/java/android/util/apk/ApkSignatureSchemeV3Verifier.java @@ -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); } diff --git a/core/java/android/util/apk/ApkSignatureVerifier.java b/core/java/android/util/apk/ApkSignatureVerifier.java index ac4ea75b38e3..ab67d372021b 100644 --- a/core/java/android/util/apk/ApkSignatureVerifier.java +++ b/core/java/android/util/apk/ApkSignatureVerifier.java @@ -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); diff --git a/services/core/java/com/android/server/pm/PackageInstallerSession.java b/services/core/java/com/android/server/pm/PackageInstallerSession.java index de0849fa9951..6f85b5c93e9e 100644 --- a/services/core/java/com/android/server/pm/PackageInstallerSession.java +++ b/services/core/java/com/android/server/pm/PackageInstallerSession.java @@ -1442,7 +1442,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { } if (mSigningDetails == PackageParser.SigningDetails.UNKNOWN) { try { - mSigningDetails = ApkSignatureVerifier.plsCertsNoVerifyOnlyCerts( + mSigningDetails = ApkSignatureVerifier.unsafeGetCertsWithoutVerification( pkgInfo.applicationInfo.sourceDir, PackageParser.SigningDetails.SignatureSchemeVersion.JAR); } catch (PackageParserException e) { |