1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8357592: Update output parsing in test/jdk/sun/security/tools/jarsigner/compatibility/Compatibility.java

Browse Source 
Reviewed-by: rhalade
This commit is contained in:
Matthew Donovan 2025-06-04 18:07:07 +00:00
parent 8939acc8ab
commit 5ed246d17d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/jdk/sun/security/tools/jarsigner/compatibility/Compatibility.java
View File

@ -516,7 +516,7 @@ public class Compatibility {
String line; String line;
while ((line = reader.readLine()) != null) { while ((line = reader.readLine()) != null) {
String item = line.trim(); String item = line.trim();
if (!item.isEmpty()) { if (!item.isEmpty() && !item.startsWith("#")) {
list.add(item); list.add(item);
} }
} }
@ -718,8 +718,8 @@ public class Compatibility {
String match = "^ (" String match = "^ ("
+ " Signature algorithm: " + signItem.certInfo. + " Signature algorithm: " + signItem.certInfo.
expectedSigalg(signItem) + ", " + signItem.certInfo. expectedSigalg(signItem) + ", " + signItem.certInfo.
expectedKeySize() + "-bit " + signItem.certInfo. expectedKeySize() + "-bit (" + signItem.certInfo.
expectedKeyAlgorithm() + " key" expectedKeyAlgorithm() + " key|key)"
+ ")|(" + ")|("
+ " Digest algorithm: " + signItem.expectedDigestAlg() + " Digest algorithm: " + signItem.expectedDigestAlg()
+ (isWeakAlg(signItem.expectedDigestAlg()) ? " \\(weak\\)" : "") + (isWeakAlg(signItem.expectedDigestAlg()) ? " \\(weak\\)" : "")

2
test/jdk/sun/security/tools/jarsigner/warnings/Test.java
View File

@ -149,7 +149,7 @@ public abstract class Test {
+ "This algorithm will be disabled in a future update."; + "This algorithm will be disabled in a future update.";
static final String WEAK_KEY_WARNING static final String WEAK_KEY_WARNING
= "It will be disabled in a future update."; = "will be disabled in a future update.";
static final String JAR_SIGNED = "jar signed."; static final String JAR_SIGNED = "jar signed.";