8017049: rename property jdk.tls.rejectClientInitializedRenego
Reviewed-by: vinnie, wetmore, mullan
--- a/jdk/src/share/classes/sun/security/ssl/Handshaker.java Tue Jun 25 21:03:08 2013 -0700
+++ b/jdk/src/share/classes/sun/security/ssl/Handshaker.java Wed Jun 26 06:32:40 2013 -0700
@@ -187,14 +187,14 @@
"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;
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NoImpactServerRenego.java Tue Jun 25 21:03:08 2013 -0700
+++ b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NoImpactServerRenego.java Wed Jun 26 06:32:40 2013 -0700
@@ -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.*;
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/RejectClientRenego.java Tue Jun 25 21:03:08 2013 -0700
+++ b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/RejectClientRenego.java Wed Jun 26 06:32:40 2013 -0700
@@ -216,7 +216,8 @@
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");