# HG changeset patch # User jjiang # Date 1515551791 28800 # Node ID 50cd89fe209fb854e0ad7a127b0835cf70f32a91 # Parent 37d2147852fca30f4039de201ab165015f3e01e6 8194257: javax/net/ssl/compatibility/Compatibility.java should be updated for JDK 6 after JDK-8174748 Summary: Marks some of AES_256 and AES_128 cipher suites are JDK 6 enabled Reviewed-by: xuelei diff -r 37d2147852fc -r 50cd89fe209f test/jdk/javax/net/ssl/compatibility/Parameter.java --- a/test/jdk/javax/net/ssl/compatibility/Parameter.java Wed Jan 10 00:08:46 2018 +0100 +++ b/test/jdk/javax/net/ssl/compatibility/Parameter.java Tue Jan 09 18:36:31 2018 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 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 @@ -65,15 +65,15 @@ TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384( Protocol.TLSV1_2, JdkRelease.JDK7), TLS_RSA_WITH_AES_256_CBC_SHA256( - Protocol.TLSV1_2, JdkRelease.JDK7), + Protocol.TLSV1_2, JdkRelease.JDK6), TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384( Protocol.TLSV1_2, JdkRelease.JDK7), TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384( Protocol.TLSV1_2, JdkRelease.JDK7), TLS_DHE_RSA_WITH_AES_256_CBC_SHA256( - Protocol.TLSV1_2, JdkRelease.JDK7), + Protocol.TLSV1_2, JdkRelease.JDK6), TLS_DHE_DSS_WITH_AES_256_CBC_SHA256( - Protocol.TLSV1_2, JdkRelease.JDK7), + Protocol.TLSV1_2, JdkRelease.JDK6), TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA(), TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA(), TLS_RSA_WITH_AES_256_CBC_SHA(), @@ -86,15 +86,15 @@ TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256( Protocol.TLSV1_2, JdkRelease.JDK7), TLS_RSA_WITH_AES_128_CBC_SHA256( - Protocol.TLSV1_2, JdkRelease.JDK7), + Protocol.TLSV1_2, JdkRelease.JDK6), TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256( Protocol.TLSV1_2, JdkRelease.JDK7), TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256( Protocol.TLSV1_2, JdkRelease.JDK7), TLS_DHE_RSA_WITH_AES_128_CBC_SHA256( - Protocol.TLSV1_2, JdkRelease.JDK7), + Protocol.TLSV1_2, JdkRelease.JDK6), TLS_DHE_DSS_WITH_AES_128_CBC_SHA256( - Protocol.TLSV1_2, JdkRelease.JDK7), + Protocol.TLSV1_2, JdkRelease.JDK6), TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA(), TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA(), TLS_RSA_WITH_AES_128_CBC_SHA(),