archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 14:24:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8314199: Initial size PBEKeyFactory#validTypes is not up-to-date

Browse source 
Reviewed-by: jnimeh
This commit is contained in:
Kevin Driver 2023-10-10 05:43:12 +00:00
parent d313915974
commit e882718a60
1 changed files with 25 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

49
src/java.base/share/classes/com/sun/crypto/provider/PBEKeyFactory.java
View file

@ -33,6 +33,7 @@ import javax.crypto.SecretKeyFactorySpi;
import javax.crypto.spec.PBEKeySpec; import javax.crypto.spec.PBEKeySpec;
import java.util.HashSet; import java.util.HashSet;
import java.util.Locale; import java.util.Locale;
import java.util.Set;
/** /**
* This class implements a key factory for PBE keys according to PKCS#5, * This class implements a key factory for PBE keys according to PKCS#5,
@ -46,7 +47,7 @@ import java.util.Locale;
abstract class PBEKeyFactory extends SecretKeyFactorySpi { abstract class PBEKeyFactory extends SecretKeyFactorySpi {
private String type; private String type;
private static HashSet<String> validTypes; private static final HashSet<String> validTypes;
/** /**
* Simple constructor * Simple constructor
@ -56,29 +57,29 @@ abstract class PBEKeyFactory extends SecretKeyFactorySpi {
} }
static { static {
validTypes = HashSet.newHashSet(17); validTypes = new HashSet<String>(
validTypes.add("PBEWithMD5AndDES".toUpperCase(Locale.ENGLISH)); Set.of("PBEWithMD5AndDES".toUpperCase(Locale.ENGLISH),
validTypes.add("PBEWithSHA1AndDESede".toUpperCase(Locale.ENGLISH)); "PBEWithSHA1AndDESede".toUpperCase(Locale.ENGLISH),
validTypes.add("PBEWithSHA1AndRC2_40".toUpperCase(Locale.ENGLISH)); "PBEWithSHA1AndRC2_40".toUpperCase(Locale.ENGLISH),
validTypes.add("PBEWithSHA1AndRC2_128".toUpperCase(Locale.ENGLISH)); "PBEWithSHA1AndRC2_128".toUpperCase(Locale.ENGLISH),
validTypes.add("PBEWithSHA1AndRC4_40".toUpperCase(Locale.ENGLISH)); "PBEWithSHA1AndRC4_40".toUpperCase(Locale.ENGLISH),
validTypes.add("PBEWithSHA1AndRC4_128".toUpperCase(Locale.ENGLISH)); "PBEWithSHA1AndRC4_128".toUpperCase(Locale.ENGLISH),
// Proprietary algorithm. // Proprietary algorithm.
validTypes.add("PBEWithMD5AndTripleDES".toUpperCase(Locale.ENGLISH)); "PBEWithMD5AndTripleDES".toUpperCase(Locale.ENGLISH),
validTypes.add("PBEWithHmacSHA1AndAES_128".toUpperCase(Locale.ENGLISH)); "PBEWithHmacSHA1AndAES_128".toUpperCase(Locale.ENGLISH),
validTypes.add("PBEWithHmacSHA224AndAES_128".toUpperCase(Locale.ENGLISH)); "PBEWithHmacSHA224AndAES_128".toUpperCase(Locale.ENGLISH),
validTypes.add("PBEWithHmacSHA256AndAES_128".toUpperCase(Locale.ENGLISH)); "PBEWithHmacSHA256AndAES_128".toUpperCase(Locale.ENGLISH),
validTypes.add("PBEWithHmacSHA384AndAES_128".toUpperCase(Locale.ENGLISH)); "PBEWithHmacSHA384AndAES_128".toUpperCase(Locale.ENGLISH),
validTypes.add("PBEWithHmacSHA512AndAES_128".toUpperCase(Locale.ENGLISH)); "PBEWithHmacSHA512AndAES_128".toUpperCase(Locale.ENGLISH),
validTypes.add("PBEWithHmacSHA512/224AndAES_128".toUpperCase(Locale.ENGLISH)); "PBEWithHmacSHA512/224AndAES_128".toUpperCase(Locale.ENGLISH),
validTypes.add("PBEWithHmacSHA512/256AndAES_128".toUpperCase(Locale.ENGLISH)); "PBEWithHmacSHA512/256AndAES_128".toUpperCase(Locale.ENGLISH),
validTypes.add("PBEWithHmacSHA1AndAES_256".toUpperCase(Locale.ENGLISH)); "PBEWithHmacSHA1AndAES_256".toUpperCase(Locale.ENGLISH),
validTypes.add("PBEWithHmacSHA224AndAES_256".toUpperCase(Locale.ENGLISH)); "PBEWithHmacSHA224AndAES_256".toUpperCase(Locale.ENGLISH),
validTypes.add("PBEWithHmacSHA256AndAES_256".toUpperCase(Locale.ENGLISH)); "PBEWithHmacSHA256AndAES_256".toUpperCase(Locale.ENGLISH),
validTypes.add("PBEWithHmacSHA384AndAES_256".toUpperCase(Locale.ENGLISH)); "PBEWithHmacSHA384AndAES_256".toUpperCase(Locale.ENGLISH),
validTypes.add("PBEWithHmacSHA512AndAES_256".toUpperCase(Locale.ENGLISH)); "PBEWithHmacSHA512AndAES_256".toUpperCase(Locale.ENGLISH),
validTypes.add("PBEWithHmacSHA512/224AndAES_256".toUpperCase(Locale.ENGLISH)); "PBEWithHmacSHA512/224AndAES_256".toUpperCase(Locale.ENGLISH),
validTypes.add("PBEWithHmacSHA512/256AndAES_256".toUpperCase(Locale.ENGLISH)); "PBEWithHmacSHA512/256AndAES_256".toUpperCase(Locale.ENGLISH)));
} }
public static final class PBEWithMD5AndDES extends PBEKeyFactory { public static final class PBEWithMD5AndDES extends PBEKeyFactory {