8282279: Interpret case-insensitive string locale independently
Reviewed-by: weijun
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLCipher.java b/src/java.base/share/classes/sun/security/ssl/SSLCipher.java
index 26e7ea2..34f6bdd 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLCipher.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLCipher.java
@@ -39,6 +39,7 @@
import java.util.AbstractMap.SimpleImmutableEntry;
import java.util.Arrays;
import java.util.HashMap;
+import java.util.Locale;
import java.util.Map;
import javax.crypto.BadPaddingException;
import javax.crypto.Cipher;
@@ -430,7 +431,8 @@
for (String entry : propvalue) {
int index;
// If this is not a UsageLimit, goto to next entry.
- String[] values = entry.trim().toUpperCase().split(" ");
+ String[] values =
+ entry.trim().toUpperCase(Locale.ENGLISH).split(" ");
if (values[1].contains(tag[0])) {
index = 0;
@@ -1865,10 +1867,10 @@
this.random = random;
keyLimitCountdown = cipherLimits.getOrDefault(
- algorithm.toUpperCase() + ":" + tag[0], 0L);
+ algorithm.toUpperCase(Locale.ENGLISH) + ":" + tag[0], 0L);
if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
SSLLogger.fine("KeyLimit read side: algorithm = " +
- algorithm.toUpperCase() + ":" + tag[0] +
+ algorithm.toUpperCase(Locale.ENGLISH) + ":" + tag[0] +
"\ncountdown value = " + keyLimitCountdown);
}
if (keyLimitCountdown > 0) {
@@ -2019,10 +2021,10 @@
this.random = random;
keyLimitCountdown = cipherLimits.getOrDefault(
- algorithm.toUpperCase() + ":" + tag[0], 0L);
+ algorithm.toUpperCase(Locale.ENGLISH) + ":" + tag[0], 0L);
if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
SSLLogger.fine("KeyLimit write side: algorithm = "
- + algorithm.toUpperCase() + ":" + tag[0] +
+ + algorithm.toUpperCase(Locale.ENGLISH) + ":" + tag[0] +
"\ncountdown value = " + keyLimitCountdown);
}
if (keyLimitCountdown > 0) {
@@ -2279,9 +2281,9 @@
this.random = random;
keyLimitCountdown = cipherLimits.getOrDefault(
- algorithm.toUpperCase() + ":" + tag[0], 0L);
+ algorithm.toUpperCase(Locale.ENGLISH) + ":" + tag[0], 0L);
if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
- SSLLogger.fine("algorithm = " + algorithm.toUpperCase() +
+ SSLLogger.fine("algorithm = " + algorithm.toUpperCase(Locale.ENGLISH) +
":" + tag[0] + "\ncountdown value = " +
keyLimitCountdown);
}
@@ -2561,9 +2563,9 @@
this.random = random;
keyLimitCountdown = cipherLimits.getOrDefault(
- algorithm.toUpperCase() + ":" + tag[0], 0L);
+ algorithm.toUpperCase(Locale.ENGLISH) + ":" + tag[0], 0L);
if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
- SSLLogger.fine("algorithm = " + algorithm.toUpperCase() +
+ SSLLogger.fine("algorithm = " + algorithm.toUpperCase(Locale.ENGLISH) +
":" + tag[0] + "\ncountdown value = " +
keyLimitCountdown);
}
diff --git a/src/java.base/share/classes/sun/security/util/DisabledAlgorithmConstraints.java b/src/java.base/share/classes/sun/security/util/DisabledAlgorithmConstraints.java
index 03e9cf6..67fe867 100644
--- a/src/java.base/share/classes/sun/security/util/DisabledAlgorithmConstraints.java
+++ b/src/java.base/share/classes/sun/security/util/DisabledAlgorithmConstraints.java
@@ -783,7 +783,7 @@
for (String usage : usages) {
boolean match = false;
- switch (usage.toLowerCase()) {
+ switch (usage.toLowerCase(Locale.ENGLISH)) {
case "tlsserver":
match = variant.equals(Validator.VAR_TLS_SERVER);
break;
diff --git a/src/java.base/share/classes/sun/security/util/SecurityProviderConstants.java b/src/java.base/share/classes/sun/security/util/SecurityProviderConstants.java
index ed826df..166c4a5 100644
--- a/src/java.base/share/classes/sun/security/util/SecurityProviderConstants.java
+++ b/src/java.base/share/classes/sun/security/util/SecurityProviderConstants.java
@@ -140,7 +140,8 @@
}
continue;
}
- String algoName = algoAndValue[0].trim().toUpperCase();
+ String algoName =
+ algoAndValue[0].trim().toUpperCase(Locale.ENGLISH);
int value = -1;
try {
value = Integer.parseInt(algoAndValue[1].trim());
diff --git a/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java b/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java
index d07152e..6cc86b0 100644
--- a/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java
+++ b/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java
@@ -386,7 +386,8 @@
.jarConstraints().permits(algorithm, params, false);
} catch (GeneralSecurityException e) {
permittedAlgs.put(algorithm, Boolean.FALSE);
- permittedAlgs.put(key.toUpperCase(), Boolean.FALSE);
+ permittedAlgs.put(key.toUpperCase(Locale.ENGLISH),
+ Boolean.FALSE);
if (debug != null) {
if (e.getMessage() != null) {
debug.println(key + ": " + e.getMessage());
diff --git a/src/java.base/share/classes/sun/security/util/TlsChannelBinding.java b/src/java.base/share/classes/sun/security/util/TlsChannelBinding.java
index 8f7ac50..079bd33 100644
--- a/src/java.base/share/classes/sun/security/util/TlsChannelBinding.java
+++ b/src/java.base/share/classes/sun/security/util/TlsChannelBinding.java
@@ -31,6 +31,7 @@
import java.security.cert.X509Certificate;
import java.util.Arrays;
import java.util.Hashtable;
+import java.util.Locale;
/**
* This class implements the Channel Binding for TLS as defined in
@@ -101,7 +102,7 @@
final byte[] prefix =
TlsChannelBindingType.TLS_SERVER_END_POINT.getName().concat(":").getBytes();
String hashAlg = serverCertificate.getSigAlgName().
- replace("SHA", "SHA-").toUpperCase();
+ replace("SHA", "SHA-").toUpperCase(Locale.ENGLISH);
int ind = hashAlg.indexOf("WITH");
if (ind > 0) {
hashAlg = hashAlg.substring(0, ind);
