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

8282316: Operation before String case conversion

Browse source 
Reviewed-by: valeriep
This commit is contained in:
Xue-Lei Andrew Fan 2022-02-24 16:25:47 +00:00
parent 0796620b07
commit abc0ce11df
1 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/java.base/share/classes/sun/security/util/SignatureUtil.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -47,32 +47,39 @@ import sun.security.x509.AlgorithmId;
public class SignatureUtil { public class SignatureUtil {
/** /**
* Convert OID.1.2.3.4 or 1.2.3.4 to its matching stdName. * Convert OID.1.2.3.4 or 1.2.3.4 to its matching stdName, and return
* upper case algorithm name.
* *
* @param algName input, could be in any form * @param algName input, could be in any form
* @return the matching stdName, or {@code algName} if it is not in the * @return the matching algorithm name or the OID string in upper case.
* form of an OID, or the OID value if no match is found.
*/ */
private static String checkName(String algName) { private static String checkName(String algName) {
if (!algName.contains(".")) { algName = algName.toUpperCase(Locale.ENGLISH);
return algName; if (algName.contains(".")) {
} else {
// convert oid to String // convert oid to String
if (algName.startsWith("OID.")) { if (algName.startsWith("OID.")) {
algName = algName.substring(4); algName = algName.substring(4);
} }
KnownOIDs ko = KnownOIDs.findMatch(algName); KnownOIDs ko = KnownOIDs.findMatch(algName);
return ko != null ? ko.stdName() : algName; if (ko != null) {
return ko.stdName().toUpperCase(Locale.ENGLISH);
}
} }
return algName;
} }
// Utility method of creating an AlgorithmParameters object with // Utility method of creating an AlgorithmParameters object with
// the specified algorithm name and encoding // the specified algorithm name and encoding
//
// Note this method can be called only after converting OID.1.2.3.4 or
// 1.2.3.4 to its matching stdName, which is implemented in the
// checkName(String) method.
private static AlgorithmParameters createAlgorithmParameters(String algName, private static AlgorithmParameters createAlgorithmParameters(String algName,
byte[] paramBytes) throws ProviderException { byte[] paramBytes) throws ProviderException {
try { try {
algName = checkName(algName);
AlgorithmParameters result = AlgorithmParameters result =
AlgorithmParameters.getInstance(algName); AlgorithmParameters.getInstance(algName);
result.init(paramBytes); result.init(paramBytes);
@ -96,7 +103,7 @@ public class SignatureUtil {
AlgorithmParameterSpec paramSpec = null; AlgorithmParameterSpec paramSpec = null;
if (params != null) { if (params != null) {
sigName = checkName(sigName).toUpperCase(Locale.ENGLISH); sigName = checkName(sigName);
// AlgorithmParameters.getAlgorithm() may returns oid if it's // AlgorithmParameters.getAlgorithm() may returns oid if it's
// created during DER decoding. Convert to use the standard name // created during DER decoding. Convert to use the standard name
// before passing it to RSAUtil // before passing it to RSAUtil
@ -140,7 +147,7 @@ public class SignatureUtil {
AlgorithmParameterSpec paramSpec = null; AlgorithmParameterSpec paramSpec = null;
if (paramBytes != null) { if (paramBytes != null) {
sigName = checkName(sigName).toUpperCase(Locale.ENGLISH); sigName = checkName(sigName);
if (sigName.contains("RSA")) { if (sigName.contains("RSA")) {
AlgorithmParameters params = AlgorithmParameters params =
createAlgorithmParameters(sigName, paramBytes); createAlgorithmParameters(sigName, paramBytes);
@ -313,7 +320,7 @@ public class SignatureUtil {
public static AlgorithmParameterSpec getDefaultParamSpec( public static AlgorithmParameterSpec getDefaultParamSpec(
String sigAlg, Key k) { String sigAlg, Key k) {
sigAlg = checkName(sigAlg); sigAlg = checkName(sigAlg);
if (sigAlg.equalsIgnoreCase("RSASSA-PSS")) { if (sigAlg.equals("RSASSA-PSS")) {
if (k instanceof RSAKey) { if (k instanceof RSAKey) {
AlgorithmParameterSpec spec = ((RSAKey) k).getParams(); AlgorithmParameterSpec spec = ((RSAKey) k).getParams();
if (spec instanceof PSSParameterSpec) { if (spec instanceof PSSParameterSpec) {
@ -428,7 +435,7 @@ public class SignatureUtil {
*/ */
public static void checkKeyAndSigAlgMatch(PrivateKey key, String sAlg) { public static void checkKeyAndSigAlgMatch(PrivateKey key, String sAlg) {
String kAlg = key.getAlgorithm().toUpperCase(Locale.ENGLISH); String kAlg = key.getAlgorithm().toUpperCase(Locale.ENGLISH);
sAlg = checkName(sAlg).toUpperCase(Locale.ENGLISH); sAlg = checkName(sAlg);
switch (sAlg) { switch (sAlg) {
case "RSASSA-PSS" -> { case "RSASSA-PSS" -> {
if (!kAlg.equals("RSASSA-PSS") if (!kAlg.equals("RSASSA-PSS")