From d22a89a1aeac40e2dbb613ca45fe2d2fc122ba76 Mon Sep 17 00:00:00 2001 From: Xue-Lei Andrew Fan Date: Wed, 26 Jun 2013 06:32:40 -0700 Subject: [PATCH] 8017049: rename property jdk.tls.rejectClientInitializedRenego Reviewed-by: vinnie, wetmore, mullan --- jdk/src/share/classes/sun/security/ssl/Handshaker.java | 8 ++++---- .../internal/ssl/SSLSocketImpl/NoImpactServerRenego.java | 2 +- .../internal/ssl/SSLSocketImpl/RejectClientRenego.java | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/jdk/src/share/classes/sun/security/ssl/Handshaker.java b/jdk/src/share/classes/sun/security/ssl/Handshaker.java index 8314c379d33..17b1f92ac74 100644 --- a/jdk/src/share/classes/sun/security/ssl/Handshaker.java +++ b/jdk/src/share/classes/sun/security/ssl/Handshaker.java @@ -187,14 +187,14 @@ abstract class Handshaker { "sun.security.ssl.allowLegacyHelloMessages", true); // To prevent the TLS renegotiation issues, by setting system property - // "jdk.tls.rejectClientInitializedRenego" to true, applications in server - // side can disable all client initiated SSL renegotiations regardless - // of the support of TLS protocols. + // "jdk.tls.rejectClientInitiatedRenegotiation" to true, applications in + // server side can disable all client initiated SSL renegotiations + // regardless of the support of TLS protocols. // // By default, allow client initiated renegotiations. static final boolean rejectClientInitiatedRenego = Debug.getBooleanProperty( - "jdk.tls.rejectClientInitializedRenego", false); + "jdk.tls.rejectClientInitiatedRenegotiation", false); // need to dispose the object when it is invalidated boolean invalidated; diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NoImpactServerRenego.java b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NoImpactServerRenego.java index 5ef0c76dca1..ab23ce4239c 100644 --- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NoImpactServerRenego.java +++ b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NoImpactServerRenego.java @@ -29,7 +29,7 @@ * @bug 7188658 * @summary Add possibility to disable client initiated renegotiation * @run main/othervm - * -Djdk.tls.rejectClientInitializedRenego=true NoImpactServerRenego + * -Djdk.tls.rejectClientInitiatedRenegotiation=true NoImpactServerRenego */ import java.io.*; diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/RejectClientRenego.java b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/RejectClientRenego.java index 29f80d9e15b..01a7febca29 100644 --- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/RejectClientRenego.java +++ b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/RejectClientRenego.java @@ -216,7 +216,8 @@ public class RejectClientRenego implements System.setProperty("javax.net.ssl.trustStorePassword", passwd); // reject client initialized SSL renegotiation. - System.setProperty("jdk.tls.rejectClientInitializedRenego", "true"); + System.setProperty( + "jdk.tls.rejectClientInitiatedRenegotiation", "true"); if (debug) System.setProperty("javax.net.debug", "all");