From 06fdb61e1cdc9abf9ac4fa62fd63992d298baffa Mon Sep 17 00:00:00 2001
From: Sean Mullan <mullan@openjdk.org>
Date: Fri, 25 Jul 2025 12:55:39 +0000
Subject: [PATCH] 8361964: Remove outdated algorithms from requirements and add
 PBES2 algorithms

Reviewed-by: hchao
---
 .../share/classes/java/security/AlgorithmParameters.java   | 3 ++-
 src/java.base/share/classes/javax/crypto/Cipher.java       | 7 ++-----
 src/java.base/share/classes/javax/crypto/KeyGenerator.java | 1 -
 src/java.base/share/classes/javax/crypto/Mac.java          | 1 +
 .../share/classes/javax/crypto/SecretKeyFactory.java       | 4 +++-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/java.base/share/classes/java/security/AlgorithmParameters.java b/src/java.base/share/classes/java/security/AlgorithmParameters.java
index defe25571f7..2a6fe830ba9 100644
--- a/src/java.base/share/classes/java/security/AlgorithmParameters.java
+++ b/src/java.base/share/classes/java/security/AlgorithmParameters.java
@@ -55,10 +55,11 @@ import java.util.Objects;
  * <ul>
  * <li>{@code AES}</li>
  * <li>{@code ChaCha20-Poly1305}</li>
- * <li>{@code DESede}</li>
  * <li>{@code DiffieHellman}</li>
  * <li>{@code DSA}</li>
  * <li>{@code EC} (secp256r1, secp384r1)</li>
+ * <li>{@code PBEWithHmacSHA256AndAES_128}</li>
+ * <li>{@code PBEWithHmacSHA256AndAES_256}</li>
  * <li>{@code RSASSA-PSS} (MGF1 mask generation function and SHA-256 or SHA-384
  *     hash algorithms)</li>
  * </ul>
diff --git a/src/java.base/share/classes/javax/crypto/Cipher.java b/src/java.base/share/classes/javax/crypto/Cipher.java
index 74971182039..82a607a5553 100644
--- a/src/java.base/share/classes/javax/crypto/Cipher.java
+++ b/src/java.base/share/classes/javax/crypto/Cipher.java
@@ -127,11 +127,8 @@ import sun.security.util.KnownOIDs;
  * <li>{@code AES/ECB/PKCS5Padding} (128)</li>
  * <li>{@code AES/GCM/NoPadding} (128, 256)</li>
  * <li>{@code ChaCha20-Poly1305}</li>
- * <li>{@code DESede/CBC/NoPadding} (168)</li>
- * <li>{@code DESede/CBC/PKCS5Padding} (168)</li>
- * <li>{@code DESede/ECB/NoPadding} (168)</li>
- * <li>{@code DESede/ECB/PKCS5Padding} (168)</li>
- * <li>{@code RSA/ECB/PKCS1Padding} (1024, 2048)</li>
+ * <li>{@code PBEWithHmacSHA256AndAES_128}</li>
+ * <li>{@code PBEWithHmacSHA256AndAES_256}</li>
  * <li>{@code RSA/ECB/OAEPWithSHA-1AndMGF1Padding} (1024, 2048)</li>
  * <li>{@code RSA/ECB/OAEPWithSHA-256AndMGF1Padding} (1024, 2048)</li>
  * </ul>
diff --git a/src/java.base/share/classes/javax/crypto/KeyGenerator.java b/src/java.base/share/classes/javax/crypto/KeyGenerator.java
index 02d0bd75753..7bbfc0a5e08 100644
--- a/src/java.base/share/classes/javax/crypto/KeyGenerator.java
+++ b/src/java.base/share/classes/javax/crypto/KeyGenerator.java
@@ -98,7 +98,6 @@ import sun.security.util.Debug;
  * <ul>
  * <li>{@code AES} (128, 256)</li>
  * <li>{@code ChaCha20}</li>
- * <li>{@code DESede} (168)</li>
  * <li>{@code HmacSHA1}</li>
  * <li>{@code HmacSHA256}</li>
  * </ul>
diff --git a/src/java.base/share/classes/javax/crypto/Mac.java b/src/java.base/share/classes/javax/crypto/Mac.java
index fb1eb2c310a..82874693cf2 100644
--- a/src/java.base/share/classes/javax/crypto/Mac.java
+++ b/src/java.base/share/classes/javax/crypto/Mac.java
@@ -58,6 +58,7 @@ import sun.security.jca.GetInstance.Instance;
  * <ul>
  * <li>{@code HmacSHA1}</li>
  * <li>{@code HmacSHA256}</li>
+ * <li>{@code PBEWithHmacSHA256}</li>
  * </ul>
  * These algorithms are described in the
  * <a href="{@docRoot}/../specs/security/standard-names.html#mac-algorithms">
diff --git a/src/java.base/share/classes/javax/crypto/SecretKeyFactory.java b/src/java.base/share/classes/javax/crypto/SecretKeyFactory.java
index d7163e4d240..7ad90eaa858 100644
--- a/src/java.base/share/classes/javax/crypto/SecretKeyFactory.java
+++ b/src/java.base/share/classes/javax/crypto/SecretKeyFactory.java
@@ -59,7 +59,9 @@ import sun.security.jca.GetInstance.Instance;
  * <p> Every implementation of the Java platform is required to support the
  * following standard {@code SecretKeyFactory} algorithms:
  * <ul>
- * <li>{@code DESede}</li>
+ * <li>{@code PBEWithHmacSHA256AndAES_128}</li>
+ * <li>{@code PBEWithHmacSHA256AndAES_256}</li>
+ * <li>{@code PBKDF2WithHmacSHA256}</li>
  * </ul>
  * These algorithms are described in the <a href=
  * "{@docRoot}/../specs/security/standard-names.html#secretkeyfactory-algorithms">