Skip to content

Commit 87d881f

Browse files
author
Bradford Wetmore
committed
8368493: Disable most test JSSE debug output by default, and increase the test default maximum output log size
Reviewed-by: jnimeh, hchao
1 parent 30be940 commit 87d881f

27 files changed

+357
-102
lines changed

‎test/jdk/javax/net/ssl/DTLS/TEST.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,3 @@ modules = \
66
java.security.jgss/sun.security.krb5.internal:+open \
77
java.security.jgss/sun.security.krb5.internal.ktab \
88
java.base/sun.security.util
9-
maxOutputSize = 2500000

‎test/jdk/javax/net/ssl/HttpsURLConnection/Equals.java‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
2727
* @library /test/lib
2828
* @modules jdk.httpserver
2929
* @build jdk.test.lib.net.SimpleSSLContext
30-
* @run main/othervm -Djavax.net.debug=ssl,handshake,record Equals
30+
* @run main/othervm Equals
3131
*/
3232
import com.sun.net.httpserver.*;
3333
import java.net.*;
@@ -38,9 +38,24 @@
3838

3939
public class Equals {
4040

41+
/*
42+
* Enables the JSSE system debugging system property:
43+
*
44+
* -Djavax.net.debug=ssl,handshake,record
45+
*
46+
* This gives a lot of low-level information about operations underway,
47+
* including specific handshake messages, and might be best examined
48+
* after gaining some familiarity with this application.
49+
*/
50+
private static final boolean debug = false;
51+
4152
static SSLContext ctx;
4253

4354
public static void main(String[] args) throws Exception {
55+
if (debug) {
56+
System.setProperty("javax.net.debug", "ssl,handshake,record");
57+
}
58+
4459
HttpsServer s2 = null;
4560
ExecutorService executor = null;
4661
try {

‎test/jdk/javax/net/ssl/SSLEngine/NoAuthClientAuth.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -99,7 +99,7 @@ public class NoAuthClientAuth {
9999
* including specific handshake messages, and might be best examined
100100
* after gaining some familiarity with this application.
101101
*/
102-
private static boolean debug = true;
102+
private static boolean debug = false;
103103

104104
private SSLContext sslc;
105105

‎test/jdk/javax/net/ssl/SSLSession/ResumeTLS13withSNI.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -54,7 +54,7 @@ public class ResumeTLS13withSNI {
5454
* including specific handshake messages, and might be best examined
5555
* after gaining some familiarity with this application.
5656
*/
57-
private static final boolean debug = true;
57+
private static final boolean debug = false;
5858

5959
private static final ByteBuffer clientOut =
6060
ByteBuffer.wrap("Hi Server, I'm Client".getBytes());

‎test/jdk/javax/net/ssl/SSLSession/ServerNameRejectedTLSSessionResumption.java‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -43,11 +43,20 @@
4343
* between the server and the client happens correctly without any
4444
* errors
4545
* @library /javax/net/ssl/templates
46-
* @run main/othervm -Djavax.net.debug=all
47-
* ServerNameRejectedTLSSessionResumption
46+
* @run main/othervm ServerNameRejectedTLSSessionResumption
4847
*/
4948
public class ServerNameRejectedTLSSessionResumption
5049
extends SSLContextTemplate {
50+
/*
51+
* Enables the JSSE system debugging system property:
52+
*
53+
* -Djavax.net.debug=all
54+
*
55+
* This gives a lot of low-level information about operations underway,
56+
* including specific handshake messages, and might be best examined
57+
* after gaining some familiarity with this application.
58+
*/
59+
private static final boolean debug = false;
5160

5261
private static final String CLIENT_REQUESTED_SNI = "client.local";
5362
// dummy host, no connection is attempted in this test
@@ -56,6 +65,10 @@ public class ServerNameRejectedTLSSessionResumption
5665
private static final int PEER_PORT = 12345;
5766

5867
public static void main(final String[] args) throws Exception {
68+
if (debug) {
69+
System.setProperty("javax.net.debug", "all");
70+
}
71+
5972
new ServerNameRejectedTLSSessionResumption().runTest();
6073
}
6174

‎test/jdk/javax/net/ssl/ServerName/SSLEngineExplorerMatchedSNI.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -71,7 +71,7 @@ public class SSLEngineExplorerMatchedSNI extends SSLEngineService {
7171
/*
7272
* Turn on SSL debugging?
7373
*/
74-
static boolean debug = true;
74+
static boolean debug = false;
7575

7676
/*
7777
* Define the server side of the test.

‎test/jdk/javax/net/ssl/Stapling/SSLEngineWithStapling.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,13 @@ public class SSLEngineWithStapling {
9999
/*
100100
* Enables the JSSE system debugging system property:
101101
*
102-
* -Djavax.net.debug=all
102+
* -Djavax.net.debug=ssl,handshake
103103
*
104104
* This gives a lot of low-level information about operations underway,
105105
* including specific handshake messages, and might be best examined
106106
* after gaining some familiarity with this application.
107107
*/
108-
private static final boolean debug = true;
108+
private static final boolean debug = false;
109109

110110
private SSLEngine clientEngine; // client Engine
111111
private ByteBuffer clientOut; // write side of clientEngine
@@ -151,7 +151,7 @@ public class SSLEngineWithStapling {
151151
*/
152152
public static void main(String args[]) throws Exception {
153153
if (debug) {
154-
System.setProperty("javax.net.debug", "ssl:handshake");
154+
System.setProperty("javax.net.debug", "ssl,handshake");
155155
}
156156

157157
// Create the PKI we will use for the test and start the OCSP servers

‎test/jdk/javax/net/ssl/TEST.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
maxOutputSize=500000

‎test/jdk/javax/net/ssl/TLS/TestJSSE.java‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,17 @@
2727

2828
public class TestJSSE {
2929

30+
/*
31+
* Enables the JSSE system debugging system property:
32+
*
33+
* -Djavax.net.debug=ssl,record
34+
*
35+
* This gives a lot of low-level information about operations underway,
36+
* including specific handshake messages, and might be best examined
37+
* after gaining some familiarity with this application.
38+
*/
39+
private static final boolean debug = false;
40+
3041
private static final String LOCAL_IP = InetAddress.getLoopbackAddress().getHostAddress();
3142

3243
public static void main(String... args) throws Exception {
@@ -35,7 +46,9 @@ public static void main(String... args) throws Exception {
3546
Security.setProperty("jdk.tls.disabledAlgorithms", "");
3647

3748
// enable debug output
38-
System.setProperty("javax.net.debug", "ssl,record");
49+
if (debug) {
50+
System.setProperty("javax.net.debug", "ssl,record");
51+
}
3952

4053
String srvProtocol = System.getProperty("SERVER_PROTOCOL");
4154
String clnProtocol = System.getProperty("CLIENT_PROTOCOL");

‎test/jdk/javax/net/ssl/TLSCommon/TLSTest.java‎

Lines changed: 70 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -49,98 +49,112 @@
4949
* @bug 8205111
5050
* @enablePreview
5151
* @summary Test TLS with different types of supported keys.
52-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pkcs1_sha1 TLS_AES_128_GCM_SHA256
53-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pkcs1_sha256 TLS_AES_128_GCM_SHA256
54-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pkcs1_sha384 TLS_AES_128_GCM_SHA256
55-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pkcs1_sha512 TLS_AES_128_GCM_SHA256
56-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 ec_rsa_pkcs1_sha256 TLS_AES_128_GCM_SHA256
57-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 ecdsa_sha1 TLS_AES_128_GCM_SHA256
58-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 ecdsa_secp384r1_sha384
52+
* @run main/othervm TLSTest TLSv1.3 rsa_pkcs1_sha1 TLS_AES_128_GCM_SHA256
53+
* @run main/othervm TLSTest TLSv1.3 rsa_pkcs1_sha256 TLS_AES_128_GCM_SHA256
54+
* @run main/othervm TLSTest TLSv1.3 rsa_pkcs1_sha384 TLS_AES_128_GCM_SHA256
55+
* @run main/othervm TLSTest TLSv1.3 rsa_pkcs1_sha512 TLS_AES_128_GCM_SHA256
56+
* @run main/othervm TLSTest TLSv1.3 ec_rsa_pkcs1_sha256 TLS_AES_128_GCM_SHA256
57+
* @run main/othervm TLSTest TLSv1.3 ecdsa_sha1 TLS_AES_128_GCM_SHA256
58+
* @run main/othervm TLSTest TLSv1.3 ecdsa_secp384r1_sha384
5959
* TLS_AES_128_GCM_SHA256
60-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 ecdsa_secp521r1_sha512
60+
* @run main/othervm TLSTest TLSv1.3 ecdsa_secp521r1_sha512
6161
* TLS_AES_128_GCM_SHA256
62-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pss_rsae_sha256 TLS_AES_128_GCM_SHA256
63-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pss_rsae_sha384 TLS_AES_128_GCM_SHA256
64-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pss_rsae_sha512 TLS_AES_128_GCM_SHA256
65-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pss_pss_sha256 TLS_AES_128_GCM_SHA256
66-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pss_pss_sha384 TLS_AES_128_GCM_SHA256
67-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pss_pss_sha512 TLS_AES_128_GCM_SHA256
62+
* @run main/othervm TLSTest TLSv1.3 rsa_pss_rsae_sha256 TLS_AES_128_GCM_SHA256
63+
* @run main/othervm TLSTest TLSv1.3 rsa_pss_rsae_sha384 TLS_AES_128_GCM_SHA256
64+
* @run main/othervm TLSTest TLSv1.3 rsa_pss_rsae_sha512 TLS_AES_128_GCM_SHA256
65+
* @run main/othervm TLSTest TLSv1.3 rsa_pss_pss_sha256 TLS_AES_128_GCM_SHA256
66+
* @run main/othervm TLSTest TLSv1.3 rsa_pss_pss_sha384 TLS_AES_128_GCM_SHA256
67+
* @run main/othervm TLSTest TLSv1.3 rsa_pss_pss_sha512 TLS_AES_128_GCM_SHA256
6868
*
69-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pkcs1_sha1 TLS_AES_256_GCM_SHA384
70-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pkcs1_sha256 TLS_AES_256_GCM_SHA384
71-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pkcs1_sha384 TLS_AES_256_GCM_SHA384
72-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pkcs1_sha512 TLS_AES_256_GCM_SHA384
73-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 ec_rsa_pkcs1_sha256 TLS_AES_256_GCM_SHA384
74-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 ecdsa_sha1 TLS_AES_256_GCM_SHA384
75-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 ecdsa_secp384r1_sha384
69+
* @run main/othervm TLSTest TLSv1.3 rsa_pkcs1_sha1 TLS_AES_256_GCM_SHA384
70+
* @run main/othervm TLSTest TLSv1.3 rsa_pkcs1_sha256 TLS_AES_256_GCM_SHA384
71+
* @run main/othervm TLSTest TLSv1.3 rsa_pkcs1_sha384 TLS_AES_256_GCM_SHA384
72+
* @run main/othervm TLSTest TLSv1.3 rsa_pkcs1_sha512 TLS_AES_256_GCM_SHA384
73+
* @run main/othervm TLSTest TLSv1.3 ec_rsa_pkcs1_sha256 TLS_AES_256_GCM_SHA384
74+
* @run main/othervm TLSTest TLSv1.3 ecdsa_sha1 TLS_AES_256_GCM_SHA384
75+
* @run main/othervm TLSTest TLSv1.3 ecdsa_secp384r1_sha384
7676
* TLS_AES_256_GCM_SHA384
77-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 ecdsa_secp521r1_sha512
77+
* @run main/othervm TLSTest TLSv1.3 ecdsa_secp521r1_sha512
7878
* TLS_AES_256_GCM_SHA384
79-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pss_rsae_sha256 TLS_AES_256_GCM_SHA384
80-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pss_rsae_sha384 TLS_AES_256_GCM_SHA384
81-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pss_rsae_sha512 TLS_AES_256_GCM_SHA384
82-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pss_pss_sha256 TLS_AES_256_GCM_SHA384
83-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pss_pss_sha384 TLS_AES_256_GCM_SHA384
84-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pss_pss_sha512 TLS_AES_256_GCM_SHA384
79+
* @run main/othervm TLSTest TLSv1.3 rsa_pss_rsae_sha256 TLS_AES_256_GCM_SHA384
80+
* @run main/othervm TLSTest TLSv1.3 rsa_pss_rsae_sha384 TLS_AES_256_GCM_SHA384
81+
* @run main/othervm TLSTest TLSv1.3 rsa_pss_rsae_sha512 TLS_AES_256_GCM_SHA384
82+
* @run main/othervm TLSTest TLSv1.3 rsa_pss_pss_sha256 TLS_AES_256_GCM_SHA384
83+
* @run main/othervm TLSTest TLSv1.3 rsa_pss_pss_sha384 TLS_AES_256_GCM_SHA384
84+
* @run main/othervm TLSTest TLSv1.3 rsa_pss_pss_sha512 TLS_AES_256_GCM_SHA384
8585
*
86-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 rsa_pkcs1_sha1 TLS_RSA_WITH_AES_128_CBC_SHA
87-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 rsa_pkcs1_sha256
86+
* @run main/othervm TLSTest TLSv1.2 rsa_pkcs1_sha1 TLS_RSA_WITH_AES_128_CBC_SHA
87+
* @run main/othervm TLSTest TLSv1.2 rsa_pkcs1_sha256
8888
* TLS_RSA_WITH_AES_128_CBC_SHA
89-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 rsa_pkcs1_sha384
89+
* @run main/othervm TLSTest TLSv1.2 rsa_pkcs1_sha384
9090
* TLS_RSA_WITH_AES_256_GCM_SHA384
91-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 rsa_pkcs1_sha512
91+
* @run main/othervm TLSTest TLSv1.2 rsa_pkcs1_sha512
9292
* TLS_RSA_WITH_AES_128_GCM_SHA256
93-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 ec_rsa_pkcs1_sha256
93+
* @run main/othervm TLSTest TLSv1.2 ec_rsa_pkcs1_sha256
9494
* TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
95-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 ecdsa_sha1
95+
* @run main/othervm TLSTest TLSv1.2 ecdsa_sha1
9696
* TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
97-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 ecdsa_secp384r1_sha384
97+
* @run main/othervm TLSTest TLSv1.2 ecdsa_secp384r1_sha384
9898
* TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384
99-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 ecdsa_secp521r1_sha512
99+
* @run main/othervm TLSTest TLSv1.2 ecdsa_secp521r1_sha512
100100
* TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA
101-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 rsa_pss_rsae_sha256
101+
* @run main/othervm TLSTest TLSv1.2 rsa_pss_rsae_sha256
102102
* TLS_RSA_WITH_AES_256_CBC_SHA256
103-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 rsa_pss_rsae_sha384
103+
* @run main/othervm TLSTest TLSv1.2 rsa_pss_rsae_sha384
104104
* TLS_RSA_WITH_AES_256_CBC_SHA
105-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 rsa_pss_rsae_sha512
105+
* @run main/othervm TLSTest TLSv1.2 rsa_pss_rsae_sha512
106106
* TLS_RSA_WITH_AES_128_CBC_SHA256
107-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 rsa_pss_pss_sha256
107+
* @run main/othervm TLSTest TLSv1.2 rsa_pss_pss_sha256
108108
* TLS_DHE_RSA_WITH_AES_256_CBC_SHA256
109-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 rsa_pss_pss_sha384
109+
* @run main/othervm TLSTest TLSv1.2 rsa_pss_pss_sha384
110110
* TLS_DHE_RSA_WITH_AES_256_GCM_SHA384
111-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 rsa_pss_pss_sha512
111+
* @run main/othervm TLSTest TLSv1.2 rsa_pss_pss_sha512
112112
* TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
113113
*
114-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.1 rsa_pkcs1_sha1 TLS_RSA_WITH_AES_128_CBC_SHA
115-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.1 rsa_pkcs1_sha256
114+
* @run main/othervm TLSTest TLSv1.1 rsa_pkcs1_sha1 TLS_RSA_WITH_AES_128_CBC_SHA
115+
* @run main/othervm TLSTest TLSv1.1 rsa_pkcs1_sha256
116116
* TLS_RSA_WITH_AES_256_CBC_SHA
117-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.1 rsa_pkcs1_sha384
117+
* @run main/othervm TLSTest TLSv1.1 rsa_pkcs1_sha384
118118
* TLS_RSA_WITH_AES_128_CBC_SHA
119-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.1 rsa_pkcs1_sha512
119+
* @run main/othervm TLSTest TLSv1.1 rsa_pkcs1_sha512
120120
* TLS_RSA_WITH_AES_256_CBC_SHA
121-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.1 rsa_pss_rsae_sha256
121+
* @run main/othervm TLSTest TLSv1.1 rsa_pss_rsae_sha256
122122
* TLS_RSA_WITH_AES_128_CBC_SHA
123-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.1 rsa_pss_rsae_sha384
123+
* @run main/othervm TLSTest TLSv1.1 rsa_pss_rsae_sha384
124124
* TLS_RSA_WITH_AES_256_CBC_SHA
125-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.1 rsa_pss_rsae_sha512
125+
* @run main/othervm TLSTest TLSv1.1 rsa_pss_rsae_sha512
126126
* TLS_RSA_WITH_AES_128_CBC_SHA
127127
*
128-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1 rsa_pkcs1_sha1 TLS_RSA_WITH_AES_128_CBC_SHA
129-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1 rsa_pkcs1_sha256 TLS_RSA_WITH_AES_256_CBC_SHA
130-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1 rsa_pkcs1_sha384 TLS_RSA_WITH_AES_128_CBC_SHA
131-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1 rsa_pkcs1_sha512 TLS_RSA_WITH_AES_256_CBC_SHA
132-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1 rsa_pss_rsae_sha256
128+
* @run main/othervm TLSTest TLSv1 rsa_pkcs1_sha1 TLS_RSA_WITH_AES_128_CBC_SHA
129+
* @run main/othervm TLSTest TLSv1 rsa_pkcs1_sha256 TLS_RSA_WITH_AES_256_CBC_SHA
130+
* @run main/othervm TLSTest TLSv1 rsa_pkcs1_sha384 TLS_RSA_WITH_AES_128_CBC_SHA
131+
* @run main/othervm TLSTest TLSv1 rsa_pkcs1_sha512 TLS_RSA_WITH_AES_256_CBC_SHA
132+
* @run main/othervm TLSTest TLSv1 rsa_pss_rsae_sha256
133133
* TLS_RSA_WITH_AES_128_CBC_SHA
134-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1 rsa_pss_rsae_sha384
134+
* @run main/othervm TLSTest TLSv1 rsa_pss_rsae_sha384
135135
* TLS_RSA_WITH_AES_256_CBC_SHA
136-
* @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1 rsa_pss_rsae_sha512
136+
* @run main/othervm TLSTest TLSv1 rsa_pss_rsae_sha512
137137
* TLS_RSA_WITH_AES_128_CBC_SHA
138138
*/
139139
public class TLSTest {
140140

141+
/*
142+
* Enables the JSSE system debugging system property:
143+
*
144+
* -Djavax.net.debug=ssl,handshake
145+
*
146+
* This gives a lot of low-level information about operations underway,
147+
* including specific handshake messages, and might be best examined
148+
* after gaining some familiarity with this application.
149+
*/
150+
private static final boolean debug = false;
151+
141152
private volatile static boolean clientRenegoReady = false;
142153

143154
public static void main(String[] args) throws Exception {
155+
if (debug) {
156+
System.setProperty("javax.net.debug", "ssl,handshake");
157+
}
144158

145159
final String tlsProtocol = args[0];
146160
final KeyType keyType = KeyType.valueOf(args[1]);

0 commit comments

Comments
 (0)