diff --git a/src/java.base/share/classes/java/security/AlgorithmParameters.java b/src/java.base/share/classes/java/security/AlgorithmParameters.java index defe25571f7ab..2a6fe830ba9ed 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 @@ * diff --git a/src/java.base/share/classes/javax/crypto/Cipher.java b/src/java.base/share/classes/javax/crypto/Cipher.java index 22dc66127e2d6..9f3ec5c1d3ab0 100644 --- a/src/java.base/share/classes/javax/crypto/Cipher.java +++ b/src/java.base/share/classes/javax/crypto/Cipher.java @@ -150,11 +150,8 @@ *
  • {@code AES/ECB/PKCS5Padding} (128)
  • *
  • {@code AES/GCM/NoPadding} (128, 256)
  • *
  • {@code ChaCha20-Poly1305}
  • - *
  • {@code DESede/CBC/NoPadding} (168)
  • - *
  • {@code DESede/CBC/PKCS5Padding} (168)
  • - *
  • {@code DESede/ECB/NoPadding} (168)
  • - *
  • {@code DESede/ECB/PKCS5Padding} (168)
  • - *
  • {@code RSA/ECB/PKCS1Padding} (1024, 2048)
  • + *
  • {@code PBEWithHmacSHA256AndAES_128}
  • + *
  • {@code PBEWithHmacSHA256AndAES_256}
  • *
  • {@code RSA/ECB/OAEPWithSHA-1AndMGF1Padding} (1024, 2048)
  • *
  • {@code RSA/ECB/OAEPWithSHA-256AndMGF1Padding} (1024, 2048)
  • * diff --git a/src/java.base/share/classes/javax/crypto/KeyGenerator.java b/src/java.base/share/classes/javax/crypto/KeyGenerator.java index 02d0bd757531a..7bbfc0a5e0876 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 @@ * diff --git a/src/java.base/share/classes/javax/crypto/Mac.java b/src/java.base/share/classes/javax/crypto/Mac.java index fb1eb2c310a92..82874693cf2bc 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 @@ * * These algorithms are described in the * diff --git a/src/java.base/share/classes/javax/crypto/SecretKeyFactory.java b/src/java.base/share/classes/javax/crypto/SecretKeyFactory.java index d7163e4d24074..7ad90eaa85857 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 @@ *

    Every implementation of the Java platform is required to support the * following standard {@code SecretKeyFactory} algorithms: *

    * These algorithms are described in the