--- a/test/jdk/ProblemList.txt	Tue Jul 03 16:14:46 2018 -0700
+++ b/test/jdk/ProblemList.txt	Wed Jul 04 03:44:32 2018 -0700
@@ -540,9 +540,6 @@
 com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java 8030957 aix-all
 com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java  8030957 aix-all
 
-sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh       8205653 generic-all
-sun/management/jmxremote/bootstrap/RmiRegistrySslTest.java      8205653 generic-all
-
 ############################################################################
 
 # jdk_jmx

--- a/test/jdk/sun/management/jmxremote/bootstrap/management_ssltest11_ok.properties.in	Tue Jul 03 16:14:46 2018 -0700
+++ b/test/jdk/sun/management/jmxremote/bootstrap/management_ssltest11_ok.properties.in	Wed Jul 04 03:44:32 2018 -0700
@@ -1,6 +1,6 @@
-com.sun.management.jmxremote.ssl.enabled.cipher.suites=SSL_RSA_WITH_RC4_128_SHA,SSL_RSA_WITH_RC4_128_MD5
-com.sun.management.jmxremote.ssl.enabled.protocols=SSLv2Hello,SSLv3,TLSv1
+com.sun.management.jmxremote.ssl.enabled.cipher.suites=TLS_AES_128_GCM_SHA256,TLS_AES_256_GCM_SHA384
+com.sun.management.jmxremote.ssl.enabled.protocols=SSLv2Hello,SSLv3,TLSv1,TLSv1.1,TLSv1.2,TLSv1.3
 com.sun.management.jmxremote.ssl.need.client.auth=true
 com.sun.management.jmxremote.ssl.config.file=@TEST-SRC@/jmxremote_ssltest11_ok.ssl
 com.sun.management.jmxremote.authenticate=false
-javax.rmi.ssl.client.enabledCipherSuites=SSL_RSA_WITH_RC4_128_SHA,SSL_RSA_WITH_RC4_128_MD5
+javax.rmi.ssl.client.enabledCipherSuites=TLS_AES_128_GCM_SHA256,TLS_AES_256_GCM_SHA384

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/sun/management/jmxremote/bootstrap/management_ssltest15_ok.properties.in	Wed Jul 04 03:44:32 2018 -0700
@@ -0,0 +1,6 @@
+com.sun.management.jmxremote.ssl.enabled.cipher.suites=TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA
+com.sun.management.jmxremote.ssl.enabled.protocols=SSLv2Hello,SSLv3,TLSv1
+com.sun.management.jmxremote.ssl.need.client.auth=true
+com.sun.management.jmxremote.ssl.config.file=@TEST-SRC@/jmxremote_ssltest11_ok.ssl
+com.sun.management.jmxremote.authenticate=false
+javax.rmi.ssl.client.enabledCipherSuites=TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA

--- a/test/jdk/sun/management/jmxremote/bootstrap/ssl/Readme.txt	Tue Jul 03 16:14:46 2018 -0700
+++ b/test/jdk/sun/management/jmxremote/bootstrap/ssl/Readme.txt	Wed Jul 04 03:44:32 2018 -0700
@@ -1,11 +1,10 @@
 The trustore and keystore are to be generated as follows:
 
-1. keytool -genkey -alias duke -keystore keystore -validity 36500
+1. keytool -genkey -alias duke -keyalg RSA -keysize 2048 -validity 36500 -keystore keystore -storepass password
 - use password 'password' for the keystore and key passwords
 - leave all values at default
 - the certificate validity will be 100 years (should be enough for now)
 2. keytool -export -keystore keystore -alias duke -file duke.crt
-3. keytool -import -keystore truststore -alias duke -file duke.crt
+3. keytool -import -alias duke -file duke.crt -keystore truststore -storepass trustword
 - use password 'trustword' for the keystore and key passwords
 - leave all values at default
-

Binary file test/jdk/sun/management/jmxremote/bootstrap/ssl/keystore has changed

Binary file test/jdk/sun/management/jmxremote/bootstrap/ssl/truststore has changed