commit c9d01a45928e0cdd2e6102c1c0ecf23a9de3601f
author Miguel Aranda <miguelaranda@google.com> Tue Oct 22 16:03:59 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Dec 11 17:44:51 2024 -0800
tree 1a3d5ba1e82de35758e98c92bb09fe9814383309
parent a996d969fdd17c6707b84544e5d1c35e0c25b5cb

Remove 3DES from Conscrypt

Bug: 357870429
Ignore-AOSP-First: Security Fix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7f433dcc4e483fdf93c556b2f5a1455932b9790e)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:fe9c4721a54e3ce054da584ddca26cd3a0f34750)
Merged-In: Ic61848e0455a48ea4b39cd67ef78280aa403beba
Change-Id: Ic61848e0455a48ea4b39cd67ef78280aa403beba

support/src/test/java/libcore/java/security/StandardNames.java

diff --git a/support/src/test/java/libcore/java/security/StandardNames.java b/support/src/test/java/libcore/java/security/StandardNames.java
index 3eb6d10..fe088a1 100644
--- a/support/src/test/java/libcore/java/security/StandardNames.java
+++ b/support/src/test/java/libcore/java/security/StandardNames.java
@@ -770,13 +770,6 @@
                             "SSL_RSA_WITH_RC4_128_SHA",
                             "TLS_ECDH_ECDSA_WITH_RC4_128_SHA",
                             "TLS_ECDH_RSA_WITH_RC4_128_SHA",
-                            "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA",
-                            "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA",
-                            "SSL_RSA_WITH_3DES_EDE_CBC_SHA",
-                            "TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA",
-                            "TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA",
-                            "SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA",
-                            "SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA",
                             "SSL_RSA_WITH_RC4_128_MD5",
                             "TLS_EMPTY_RENEGOTIATION_INFO_SCSV")
             : CpuFeatures.isAesHardwareAccelerated() ? CIPHER_SUITES_ANDROID_AES_HARDWARE
@@ -787,19 +780,19 @@
     private static final Map<String, Integer> MINIMUM_KEY_SIZE;
     static {
         PRIVATE_KEY_SPEC_CLASSES = new HashMap<>();
-        PUBLIC_KEY_SPEC_CLASSES = new HashMap<>();
-        MINIMUM_KEY_SIZE = new HashMap<>();
         PRIVATE_KEY_SPEC_CLASSES.put("RSA", RSAPrivateCrtKeySpec.class);
-        PUBLIC_KEY_SPEC_CLASSES.put("RSA", RSAPublicKeySpec.class);
-        MINIMUM_KEY_SIZE.put("RSA", 512);
         PRIVATE_KEY_SPEC_CLASSES.put("DSA", DSAPrivateKeySpec.class);
-        PUBLIC_KEY_SPEC_CLASSES.put("DSA", DSAPublicKeySpec.class);
-        MINIMUM_KEY_SIZE.put("DSA", 512);
         PRIVATE_KEY_SPEC_CLASSES.put("DH", DHPrivateKeySpec.class);
-        PUBLIC_KEY_SPEC_CLASSES.put("DH", DHPublicKeySpec.class);
-        MINIMUM_KEY_SIZE.put("DH", 256);
         PRIVATE_KEY_SPEC_CLASSES.put("EC", ECPrivateKeySpec.class);
+        PUBLIC_KEY_SPEC_CLASSES = new HashMap<>();
+        PUBLIC_KEY_SPEC_CLASSES.put("RSA", RSAPublicKeySpec.class);
+        PUBLIC_KEY_SPEC_CLASSES.put("DSA", DSAPublicKeySpec.class);
+        PUBLIC_KEY_SPEC_CLASSES.put("DH", DHPublicKeySpec.class);
         PUBLIC_KEY_SPEC_CLASSES.put("EC", ECPublicKeySpec.class);
+        MINIMUM_KEY_SIZE = new HashMap<>();
+        MINIMUM_KEY_SIZE.put("RSA", 512);
+        MINIMUM_KEY_SIZE.put("DSA", 512);
+        MINIMUM_KEY_SIZE.put("DH", 256);
         MINIMUM_KEY_SIZE.put("EC", 256);
     }