changeset 59314:7a4d31a184f6

8245005: javax/net/ssl/compatibility/BasicConnectTest.java failed with No enum constant Reviewed-by: xuelei
author jjiang
date Sat, 16 May 2020 05:49:47 +0800
parents 5747b0588472
children 867c7b8ff48a
files test/jdk/javax/net/ssl/TLSCommon/CipherSuite.java test/jdk/javax/net/ssl/TLSCommon/interop/Utilities.java test/jdk/javax/net/ssl/compatibility/README
diffstat 3 files changed, 27 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/test/jdk/javax/net/ssl/TLSCommon/CipherSuite.java	Wed May 13 17:00:59 2020 +0200
+++ b/test/jdk/javax/net/ssl/TLSCommon/CipherSuite.java	Sat May 16 05:49:47 2020 +0800
@@ -172,12 +172,32 @@
             0x0032, KeyExAlgorithm.DHE_DSS, Protocol.SSLV3, Protocol.TLSV1_2),
     TLS_RSA_WITH_AES_128_CBC_SHA(
             0x002F, KeyExAlgorithm.RSA, Protocol.SSLV3, Protocol.TLSV1_2),
+    TLS_KRB5_EXPORT_WITH_RC4_40_MD5(
+            0x002B, KeyExAlgorithm.KRB5, Protocol.SSLV3, Protocol.TLSV1_2),
+    TLS_KRB5_EXPORT_WITH_RC2_CBC_40_MD5(
+            0x002A, KeyExAlgorithm.KRB5, Protocol.SSLV3, Protocol.TLSV1_2),
+    TLS_KRB5_EXPORT_WITH_RC4_40_SHA(
+            0x0028, KeyExAlgorithm.KRB5, Protocol.SSLV3, Protocol.TLSV1_2),
+    TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5(
+            0x0029, KeyExAlgorithm.KRB5, Protocol.SSLV3, Protocol.TLSV1_1),
+    TLS_KRB5_EXPORT_WITH_RC2_CBC_40_SHA(
+            0x0027, KeyExAlgorithm.KRB5, Protocol.SSLV3, Protocol.TLSV1_2),
+    TLS_KRB5_EXPORT_WITH_DES_CBC_40_SHA(
+            0x0026, KeyExAlgorithm.KRB5, Protocol.SSLV3, Protocol.TLSV1_1),
+    TLS_KRB5_WITH_IDEA_CBC_MD5(
+            0x0025, KeyExAlgorithm.KRB5, Protocol.SSLV3, Protocol.TLSV1_1),
+    TLS_KRB5_WITH_RC4_128_MD5(
+            0x0024, KeyExAlgorithm.KRB5, Protocol.SSLV3, Protocol.TLSV1_2),
     TLS_KRB5_WITH_3DES_EDE_CBC_MD5(
-            0x0023, KeyExAlgorithm.KRB5, Protocol.SSLV3, Protocol.TLSV1_2),
+            0x0023, KeyExAlgorithm.KRB5, Protocol.SSLV3, Protocol.TLSV1_1),
     TLS_KRB5_WITH_DES_CBC_MD5(
-            0x0022,KeyExAlgorithm.KRB5,  Protocol.SSLV3, Protocol.TLSV1_1),
+            0x0022, KeyExAlgorithm.KRB5,  Protocol.SSLV3, Protocol.TLSV1_1),
+    TLS_KRB5_WITH_IDEA_CBC_SHA(
+            0x0021, KeyExAlgorithm.KRB5, Protocol.SSLV3, Protocol.TLSV1_1),
+    TLS_KRB5_WITH_RC4_128_SHA(
+            0x0020, KeyExAlgorithm.KRB5, Protocol.SSLV3, Protocol.TLSV1_2),
     TLS_KRB5_WITH_3DES_EDE_CBC_SHA(
-            0x001F, KeyExAlgorithm.KRB5, Protocol.SSLV3, Protocol.TLSV1_2),
+            0x001F, KeyExAlgorithm.KRB5, Protocol.SSLV3, Protocol.TLSV1_1),
     TLS_KRB5_WITH_DES_CBC_SHA(
             0x001E, KeyExAlgorithm.KRB5, Protocol.SSLV3, Protocol.TLSV1_2),
     SSL_DH_anon_WITH_3DES_EDE_CBC_SHA(
--- a/test/jdk/javax/net/ssl/TLSCommon/interop/Utilities.java	Wed May 13 17:00:59 2020 +0200
+++ b/test/jdk/javax/net/ssl/TLSCommon/interop/Utilities.java	Sat May 16 05:49:47 2020 +0800
@@ -80,8 +80,7 @@
     public static final String PARAM_DELIMITER = ";";
     public static final String VALUE_DELIMITER = ",";
 
-    public static final CipherSuite[] ALL_CIPHER_SUITES
-            = Utilities.getAllCipherSuites();
+    public static final CipherSuite[] ALL_CIPHER_SUITES = getAllCipherSuites();
 
     /*
      * Gets all supported cipher suites.
@@ -101,8 +100,7 @@
                 .map(cipherSuite -> {
                     return CipherSuite.cipherSuite(cipherSuite);})
                 .filter(cipherSuite -> {
-                    return cipherSuite
-                            != CipherSuite.TLS_EMPTY_RENEGOTIATION_INFO_SCSV;})
+                    return cipherSuite != CipherSuite.TLS_EMPTY_RENEGOTIATION_INFO_SCSV; })
                 .toArray(CipherSuite[]::new);
 
         return cipherSuites;
--- a/test/jdk/javax/net/ssl/compatibility/README	Wed May 13 17:00:59 2020 +0200
+++ b/test/jdk/javax/net/ssl/compatibility/README	Sat May 16 05:49:47 2020 +0800
@@ -30,7 +30,7 @@
 jtreg [-options] \
     [-Dtest.debug=<true|false>] \
     [-Dtest.jdk.list.file=</path/to/jdkListFile>] \
-    $JDK_WORKSPACE/test/jdk/javax/net/ssl/compatibility/Compatibility.java
+    $JDK_WORKSPACE/test/jdk/javax/net/ssl/compatibility/<XXX.java>
 
 Besides the common jtreg options, like -jdk, this test introduces some more
 properties:
@@ -54,7 +54,7 @@
 $ jtreg -jdk:/path/to/latest/jdk \
     -Ddebug=true \
     -Dtest.jdk.list.file=/path/to/jdkList \
-    $JDK_WS/jdk/test/javax/net/ssl/compatibility/Compatibility.java
+    $JDK_WS/jdk/test/javax/net/ssl/compatibility/<XXX.java>
 The above example uses a file "/path/to/jdkList" to contain the paths of local
 different JDK builds through 8 to 10. The execution uses each of JDK builds as
 server and client respectively. And it enables SSL debug flag, and tests the