Mercurial > hg > openjdk > aarch64-port > jdk
changeset 11022:62afb63fd661
Merge
author | asaha |
---|---|
date | Mon, 08 Jun 2015 12:19:59 -0700 |
parents | ba679572195c (current diff) 73945a4a7653 (diff) |
children | 37d98293b182 |
files | .hgtags |
diffstat | 7 files changed, 22 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Jun 04 13:32:00 2015 -0700 +++ b/.hgtags Mon Jun 08 12:19:59 2015 -0700 @@ -422,6 +422,7 @@ 217fa7205549d196c60f814bf3fc9795d756f493 jdk8u51-b13 b7403e15864dc0c1f9740d66af91bddb3e2215e8 jdk8u51-b14 192bda44c0c463104c96058bb815a546b282ca43 jdk8u51-b15 +ee86422973691bb7efae58d201e5a382ea0bb150 jdk8u51-b16 5c31204d19e5976f025026db3d5c17331e8c44db jdk8u60-b00 c46daef6edb5385d11876ed40f292a4b62e96867 jdk8u60-b01 c10fd784956cc7099657181029ac3e790267b678 jdk8u60-b02
--- a/test/lib/testlibrary/AssertsTest.java Thu Jun 04 13:32:00 2015 -0700 +++ b/test/lib/testlibrary/AssertsTest.java Mon Jun 08 12:19:59 2015 -0700 @@ -25,7 +25,6 @@ /* @test * @summary Tests the different assertions in the Assert class - * @library /testlibrary */ public class AssertsTest { private static class Foo implements Comparable<Foo> {
--- a/test/lib/testlibrary/OutputAnalyzerReportingTest.java Thu Jun 04 13:32:00 2015 -0700 +++ b/test/lib/testlibrary/OutputAnalyzerReportingTest.java Mon Jun 08 12:19:59 2015 -0700 @@ -27,7 +27,6 @@ * @summary Test the OutputAnalyzer reporting functionality, * such as printing additional diagnostic info * (exit code, stdout, stderr, command line, etc.) - * @library /testlibrary */ import java.io.ByteArrayOutputStream;
--- a/test/lib/testlibrary/OutputAnalyzerTest.java Thu Jun 04 13:32:00 2015 -0700 +++ b/test/lib/testlibrary/OutputAnalyzerTest.java Mon Jun 08 12:19:59 2015 -0700 @@ -24,7 +24,6 @@ /* * @test * @summary Test the OutputAnalyzer utility class - * @library /testlibrary */ import jdk.testlibrary.OutputAnalyzer;
--- a/test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.java Thu Jun 04 13:32:00 2015 -0700 +++ b/test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.java Mon Jun 08 12:19:59 2015 -0700 @@ -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 Thu Jun 04 13:32:00 2015 -0700 +++ b/test/sun/management/jmxremote/bootstrap/management_ssltest07_ok.properties.in Mon Jun 08 12:19:59 2015 -0700 @@ -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 Thu Jun 04 13:32:00 2015 -0700 +++ b/test/sun/management/jmxremote/bootstrap/management_ssltest11_ok.properties.in Mon Jun 08 12:19:59 2015 -0700 @@ -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