diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-15 21:52:11 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-15 21:52:11 +0000 |
| commit | 4ae12a139a194b22c03d8bd964632cd0b27b1bce (patch) | |
| tree | 9377b651b9a765ffbc05ec4a394972c54446e1fa /src/main/java/com/android/apksig/internal/apk/ApkSigningBlockUtils.java | |
| parent | 7af27dc8d1254408713ada779ef873151585614f (diff) | |
| parent | ab50f0a22c4a770bb914d18483a6cc1dd930182b (diff) | |
| download | apksig-4ae12a139a194b22c03d8bd964632cd0b27b1bce.tar.gz | |
Snap for 8730993 from ab50f0a22c4a770bb914d18483a6cc1dd930182b to mainline-tzdata3-releaseaml_tz3_314012070aml_tz3_314012050aml_tz3_314012010aml_tz3_313110000aml_tz3_312511020aml_tz3_312511010aml_tz3_312410020aml_tz3_312410010android12-mainline-tzdata3-releaseaml_tz3_314012010
Change-Id: I23d5d80dd9244ec01bf7bdfb5dbbf9439037232a
Diffstat (limited to 'src/main/java/com/android/apksig/internal/apk/ApkSigningBlockUtils.java')
| -rw-r--r-- | src/main/java/com/android/apksig/internal/apk/ApkSigningBlockUtils.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/main/java/com/android/apksig/internal/apk/ApkSigningBlockUtils.java b/src/main/java/com/android/apksig/internal/apk/ApkSigningBlockUtils.java index 44dcc79..61b7b00 100644 --- a/src/main/java/com/android/apksig/internal/apk/ApkSigningBlockUtils.java +++ b/src/main/java/com/android/apksig/internal/apk/ApkSigningBlockUtils.java @@ -16,7 +16,6 @@ package com.android.apksig.internal.apk; -import static com.android.apksig.Constants.OID_RSA_ENCRYPTION; import static com.android.apksig.internal.apk.ContentDigestAlgorithm.CHUNKED_SHA256; import static com.android.apksig.internal.apk.ContentDigestAlgorithm.CHUNKED_SHA512; import static com.android.apksig.internal.apk.ContentDigestAlgorithm.VERITY_CHUNKED_SHA256; @@ -104,7 +103,6 @@ public class ApkSigningBlockUtils { public static final int VERSION_JAR_SIGNATURE_SCHEME = 1; public static final int VERSION_APK_SIGNATURE_SCHEME_V2 = 2; public static final int VERSION_APK_SIGNATURE_SCHEME_V3 = 3; - public static final int VERSION_APK_SIGNATURE_SCHEME_V31 = 31; public static final int VERSION_APK_SIGNATURE_SCHEME_V4 = 4; /** @@ -668,8 +666,7 @@ public class ApkSigningBlockUtils { if ("X.509".equals(publicKey.getFormat())) { encodedPublicKey = publicKey.getEncoded(); // if the key is an RSA key check for a negative modulus - String keyAlgorithm = publicKey.getAlgorithm(); - if ("RSA".equals(keyAlgorithm) || OID_RSA_ENCRYPTION.equals(keyAlgorithm)) { + if ("RSA".equals(publicKey.getAlgorithm())) { try { // Parse the encoded public key into the separate elements of the // SubjectPublicKeyInfo to obtain the SubjectPublicKey. |