Skip to content

Commit 06fdb61

Browse files
committed
8361964: Remove outdated algorithms from requirements and add PBES2 algorithms
Reviewed-by: hchao
1 parent 41c94ee commit 06fdb61

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

src/java.base/share/classes/java/security/AlgorithmParameters.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,11 @@
5555
* <ul>
5656
* <li>{@code AES}</li>
5757
* <li>{@code ChaCha20-Poly1305}</li>
58-
* <li>{@code DESede}</li>
5958
* <li>{@code DiffieHellman}</li>
6059
* <li>{@code DSA}</li>
6160
* <li>{@code EC} (secp256r1, secp384r1)</li>
61+
* <li>{@code PBEWithHmacSHA256AndAES_128}</li>
62+
* <li>{@code PBEWithHmacSHA256AndAES_256}</li>
6263
* <li>{@code RSASSA-PSS} (MGF1 mask generation function and SHA-256 or SHA-384
6364
* hash algorithms)</li>
6465
* </ul>

src/java.base/share/classes/javax/crypto/Cipher.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,8 @@
127127
* <li>{@code AES/ECB/PKCS5Padding} (128)</li>
128128
* <li>{@code AES/GCM/NoPadding} (128, 256)</li>
129129
* <li>{@code ChaCha20-Poly1305}</li>
130-
* <li>{@code DESede/CBC/NoPadding} (168)</li>
131-
* <li>{@code DESede/CBC/PKCS5Padding} (168)</li>
132-
* <li>{@code DESede/ECB/NoPadding} (168)</li>
133-
* <li>{@code DESede/ECB/PKCS5Padding} (168)</li>
134-
* <li>{@code RSA/ECB/PKCS1Padding} (1024, 2048)</li>
130+
* <li>{@code PBEWithHmacSHA256AndAES_128}</li>
131+
* <li>{@code PBEWithHmacSHA256AndAES_256}</li>
135132
* <li>{@code RSA/ECB/OAEPWithSHA-1AndMGF1Padding} (1024, 2048)</li>
136133
* <li>{@code RSA/ECB/OAEPWithSHA-256AndMGF1Padding} (1024, 2048)</li>
137134
* </ul>

src/java.base/share/classes/javax/crypto/KeyGenerator.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@
9898
* <ul>
9999
* <li>{@code AES} (128, 256)</li>
100100
* <li>{@code ChaCha20}</li>
101-
* <li>{@code DESede} (168)</li>
102101
* <li>{@code HmacSHA1}</li>
103102
* <li>{@code HmacSHA256}</li>
104103
* </ul>

src/java.base/share/classes/javax/crypto/Mac.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
* <ul>
5959
* <li>{@code HmacSHA1}</li>
6060
* <li>{@code HmacSHA256}</li>
61+
* <li>{@code PBEWithHmacSHA256}</li>
6162
* </ul>
6263
* These algorithms are described in the
6364
* <a href="{@docRoot}/../specs/security/standard-names.html#mac-algorithms">

src/java.base/share/classes/javax/crypto/SecretKeyFactory.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@
5959
* <p> Every implementation of the Java platform is required to support the
6060
* following standard {@code SecretKeyFactory} algorithms:
6161
* <ul>
62-
* <li>{@code DESede}</li>
62+
* <li>{@code PBEWithHmacSHA256AndAES_128}</li>
63+
* <li>{@code PBEWithHmacSHA256AndAES_256}</li>
64+
* <li>{@code PBKDF2WithHmacSHA256}</li>
6365
* </ul>
6466
* These algorithms are described in the <a href=
6567
* "{@docRoot}/../specs/security/standard-names.html#secretkeyfactory-algorithms">

0 commit comments

Comments
 (0)