stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8269933: test/jdk/javax/net/ssl/compatibility/JdkInfo incorrect verification of protocol and cipher support

Browse Source 
Reviewed-by: xuelei, rhalade
This commit is contained in:
Fernando Guallini 2021-07-21 03:38:40 +00:00 committed by Rajan Halade
parent 1eeb1791ab
commit 6346793c64
1 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
test/jdk/javax/net/ssl/compatibility/JdkInfo.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -22,7 +22,9 @@
*/
import java.nio.file.Path;
import java.util.Arrays;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
/*
@ -37,10 +39,10 @@ public class JdkInfo {
public final Path javaPath;
public final String version;
public final String supportedProtocols;
public final String enabledProtocols;
public final String supportedCipherSuites;
public final String enabledCipherSuites;
public final List<String> supportedProtocols;
public final List<String> enabledProtocols;
public final List<String> supportedCipherSuites;
public final List<String> enabledCipherSuites;
public final boolean supportsSNI;
public final boolean supportsALPN;
@ -54,13 +56,26 @@ public class JdkInfo {
}
String[] attributes = Utilities.split(output, Utilities.PARAM_DELIMITER);
version = attributes[0].replaceAll(".*=", "");
supportedProtocols = attributes[1].replaceAll(".*=", "");
enabledProtocols = attributes[2].replaceAll(".*=", "");
supportedCipherSuites = attributes[3].replaceAll(".*=", "");
enabledCipherSuites = attributes[4].replaceAll(".*=", "");
supportsSNI = Boolean.valueOf(attributes[5].replaceAll(".*=", ""));
supportsALPN = Boolean.valueOf(attributes[6].replaceAll(".*=", ""));
version = parseAttribute(attributes[0]);
supportedProtocols = parseListAttribute(attributes[1]);
enabledProtocols = parseListAttribute(attributes[2]);
supportedCipherSuites = parseListAttribute(attributes[3]);
enabledCipherSuites = parseListAttribute(attributes[4]);
supportsSNI = parseBooleanAttribute(attributes[5]);
supportsALPN = parseBooleanAttribute(attributes[6]);
}
private List<String> parseListAttribute(String attribute) {
attribute = parseAttribute(attribute);
return Arrays.asList(attribute.split(","));
}
private boolean parseBooleanAttribute(String attribute) {
attribute = parseAttribute(attribute);
return Boolean.parseBoolean(attribute);
}
private String parseAttribute(String attribute) {
return attribute.replaceAll(".*=", "");
}
// Determines the specific attributes for the specified JDK.