Mercurial > hg > release > icedtea7-forest-2.6 > jdk
changeset 9713:ba99d2bbbda5
8210951: Test sun/security/ssl/SSLContextImpl/CustomizedCipherSuites.java fails
Reviewed-by: pkoppula, coffeys
author | aefimov |
---|---|
date | Mon, 01 Oct 2018 23:44:46 +0100 |
parents | 1f10820808c5 |
children | 4586938ba63d |
files | test/sun/security/ssl/SSLContextImpl/CustomizedCipherSuites.java |
diffstat | 1 files changed, 17 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/test/sun/security/ssl/SSLContextImpl/CustomizedCipherSuites.java Tue Mar 27 16:54:03 2018 +0100 +++ b/test/sun/security/ssl/SSLContextImpl/CustomizedCipherSuites.java Mon Oct 01 23:44:46 2018 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2018, 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 @@ -26,52 +26,52 @@ /* * @test - * @bug 8162362 + * @bug 8162362 8208350 * @summary Cannot enable previously default enabled cipher suites * @run main/othervm * CustomizedCipherSuites Default true * TLS_RSA_WITH_AES_128_CBC_SHA - * SSL_RSA_WITH_DES_CBC_SHA + * TLS_ECDH_anon_WITH_AES_128_CBC_SHA * @run main/othervm * -Djdk.tls.client.cipherSuites="unknown" * CustomizedCipherSuites Default true * TLS_RSA_WITH_AES_128_CBC_SHA - * SSL_RSA_WITH_DES_CBC_SHA + * TLS_ECDH_anon_WITH_AES_128_CBC_SHA * @run main/othervm * -Djdk.tls.client.cipherSuites="" * CustomizedCipherSuites Default true * TLS_RSA_WITH_AES_128_CBC_SHA - * SSL_RSA_WITH_DES_CBC_SHA + * TLS_ECDH_anon_WITH_AES_128_CBC_SHA * @run main/othervm - * -Djdk.tls.client.cipherSuites="SSL_RSA_WITH_DES_CBC_SHA" + * -Djdk.tls.client.cipherSuites="TLS_ECDH_anon_WITH_AES_128_CBC_SHA" * CustomizedCipherSuites Default true - * SSL_RSA_WITH_DES_CBC_SHA + * TLS_ECDH_anon_WITH_AES_128_CBC_SHA * TLS_RSA_WITH_AES_128_CBC_SHA * @run main/othervm - * -Djdk.tls.server.cipherSuites="SSL_RSA_WITH_DES_CBC_SHA" + * -Djdk.tls.server.cipherSuites="TLS_ECDH_anon_WITH_AES_128_CBC_SHA" * CustomizedCipherSuites Default false - * SSL_RSA_WITH_DES_CBC_SHA + * TLS_ECDH_anon_WITH_AES_128_CBC_SHA * TLS_RSA_WITH_AES_128_CBC_SHA * @run main/othervm - * -Djdk.tls.client.cipherSuites="TLS_RSA_WITH_AES_128_CBC_SHA,unknown,SSL_RSA_WITH_DES_CBC_SHA" + * -Djdk.tls.client.cipherSuites="TLS_RSA_WITH_AES_128_CBC_SHA,unknown,TLS_ECDH_anon_WITH_AES_128_CBC_SHA" * CustomizedCipherSuites Default true - * SSL_RSA_WITH_DES_CBC_SHA + * TLS_ECDH_anon_WITH_AES_128_CBC_SHA * "" * @run main/othervm - * -Djdk.tls.server.cipherSuites="TLS_RSA_WITH_AES_128_CBC_SHA,unknown,SSL_RSA_WITH_DES_CBC_SHA" + * -Djdk.tls.server.cipherSuites="TLS_RSA_WITH_AES_128_CBC_SHA,unknown,TLS_ECDH_anon_WITH_AES_128_CBC_SHA" * CustomizedCipherSuites Default false * TLS_RSA_WITH_AES_128_CBC_SHA * "" * @run main/othervm - * -Djdk.tls.server.cipherSuites="SSL_RSA_WITH_DES_CBC_SHA" + * -Djdk.tls.server.cipherSuites="TLS_ECDH_anon_WITH_AES_128_CBC_SHA" * CustomizedCipherSuites Default true * TLS_RSA_WITH_AES_128_CBC_SHA - * SSL_RSA_WITH_DES_CBC_SHA + * TLS_ECDH_anon_WITH_AES_128_CBC_SHA * @run main/othervm - * -Djdk.tls.client.cipherSuites="SSL_RSA_WITH_DES_CBC_SHA" + * -Djdk.tls.client.cipherSuites="TLS_ECDH_anon_WITH_AES_128_CBC_SHA" * CustomizedCipherSuites Default false * TLS_RSA_WITH_AES_128_CBC_SHA - * SSL_RSA_WITH_DES_CBC_SHA + * TLS_ECDH_anon_WITH_AES_128_CBC_SHA */ import javax.net.ssl.*; @@ -79,7 +79,7 @@ /** * Test the customized default cipher suites. * - * This test is based on the behavior that SSL_RSA_WITH_DES_CBC_SHA is + * This test is based on the behavior that TLS_ECDH_anon_WITH_AES_128_CBC_SHA is * disabled by default, and TLS_RSA_WITH_AES_128_CBC_SHA is enabled by * default in JDK. If the behavior is changed in the future, please * update the test cases above accordingly.