Mercurial > hg > icedtea8-forest > jdk
changeset 11196:ee8642297369 jdk8u51-b16
8081386: Test sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh test has RC4 dependencies
Reviewed-by: coffeys
author | asmotrak |
---|---|
date | Tue, 02 Jun 2015 13:49:09 +0300 |
parents | f1ba9486e70b |
children | 73945a4a7653 |
files | test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.java test/sun/management/jmxremote/bootstrap/management_ssltest07_ok.properties.in test/sun/management/jmxremote/bootstrap/management_ssltest11_ok.properties.in |
diffstat | 3 files changed, 21 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.java Wed Jun 03 20:23:19 2015 -0700 +++ b/test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.java Tue Jun 02 13:49:09 2015 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2015, 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 @@ -43,6 +43,8 @@ import sun.management.AgentConfigurationError; +import java.security.Security; + import util.TestLogger; /** @@ -133,6 +135,8 @@ "com.sun.management.jmxremote.ssl.enabled.protocols"; public static final String SSL_NEED_CLIENT_AUTH = "com.sun.management.jmxremote.ssl.need.client.auth"; + public static final String SSL_CLIENT_ENABLED_CIPHER_SUITES = + "javax.rmi.ssl.client.enabledCipherSuites"; } /** @@ -434,7 +438,7 @@ } - private void setSslProperties() { + private void setSslProperties(String clientEnabledCipherSuites) { final String defaultKeyStore = getDefaultStoreName(DefaultValues.KEYSTORE); final String defaultTrustStore = @@ -465,6 +469,13 @@ System.setProperty(PropertyNames.TRUSTSTORE_PASSWD,trustword); log.trace("setSslProperties", PropertyNames.TRUSTSTORE_PASSWD+"="+trustword); + + if (clientEnabledCipherSuites != null) { + System.setProperty("javax.rmi.ssl.client.enabledCipherSuites", + clientEnabledCipherSuites); + } else { + System.clearProperty("javax.rmi.ssl.client.enabledCipherSuites"); + } } private void checkSslConfiguration() { @@ -517,7 +528,10 @@ PropertyNames.SSL_ENABLED_PROTOCOLS + "=" + sslProtocols); - if (useSsl) setSslProperties(); + if (useSsl) { + setSslProperties(props.getProperty( + PropertyNames.SSL_CLIENT_ENABLED_CIPHER_SUITES)); + } } catch (Exception x) { System.out.println("Failed to setup SSL configuration: " + x); log.debug("checkSslConfiguration",x); @@ -871,6 +885,8 @@ * exit(1) if the test fails. **/ public static void main(String args[]) throws Exception { + Security.setProperty("jdk.tls.disabledAlgorithms", ""); + setupBasePort(); RmiBootstrapTest manager = new RmiBootstrapTest(); try {
--- a/test/sun/management/jmxremote/bootstrap/management_ssltest07_ok.properties.in Wed Jun 03 20:23:19 2015 -0700 +++ b/test/sun/management/jmxremote/bootstrap/management_ssltest07_ok.properties.in Tue Jun 02 13:49:09 2015 +0300 @@ -2,3 +2,4 @@ com.sun.management.jmxremote.ssl.enabled.protocols=SSLv2Hello,SSLv3,TLSv1 com.sun.management.jmxremote.ssl.need.client.auth=true com.sun.management.jmxremote.authenticate=false +javax.rmi.ssl.client.enabledCipherSuites=SSL_RSA_WITH_RC4_128_SHA,SSL_RSA_WITH_RC4_128_MD5
--- a/test/sun/management/jmxremote/bootstrap/management_ssltest11_ok.properties.in Wed Jun 03 20:23:19 2015 -0700 +++ b/test/sun/management/jmxremote/bootstrap/management_ssltest11_ok.properties.in Tue Jun 02 13:49:09 2015 +0300 @@ -3,3 +3,4 @@ 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