author | xuelei |
Fri, 04 Mar 2016 14:04:01 +0000 | |
changeset 36242 | 956bfe0cb926 |
permissions | -rw-r--r-- |
36242
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
1 |
/* |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
2 |
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
4 |
* |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
8 |
* |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
13 |
* accompanied this code). |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
14 |
* |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
18 |
* |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
21 |
* questions. |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
22 |
*/ |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
23 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
24 |
// SunJSSE does not support dynamic system properties, no way to re-use |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
25 |
// system properties in samevm/agentvm mode. |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
26 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
27 |
/* |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
28 |
* @test |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
29 |
* @bug 8148108 |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
30 |
* @summary Disable Diffie-Hellman keys less than 1024 bits |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
31 |
* @run main/othervm -Djdk.tls.ephemeralDHKeySize=legacy LegacyDHEKeyExchange |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
32 |
*/ |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
33 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
34 |
import java.io.*; |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
35 |
import javax.net.ssl.*; |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
36 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
37 |
public class LegacyDHEKeyExchange { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
38 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
39 |
/* |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
40 |
* ============================================================= |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
41 |
* Set the various variables needed for the tests, then |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
42 |
* specify what tests to run on each side. |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
43 |
*/ |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
44 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
45 |
/* |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
46 |
* Should we run the client or server in a separate thread? |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
47 |
* Both sides can throw exceptions, but do you have a preference |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
48 |
* as to which side should be the main thread. |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
49 |
*/ |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
50 |
static boolean separateServerThread = false; |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
51 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
52 |
/* |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
53 |
* Where do we find the keystores? |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
54 |
*/ |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
55 |
static String pathToStores = "../../../../javax/net/ssl/etc"; |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
56 |
static String keyStoreFile = "keystore"; |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
57 |
static String trustStoreFile = "truststore"; |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
58 |
static String passwd = "passphrase"; |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
59 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
60 |
/* |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
61 |
* Is the server ready to serve? |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
62 |
*/ |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
63 |
volatile static boolean serverReady = false; |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
64 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
65 |
/* |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
66 |
* Turn on SSL debugging? |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
67 |
*/ |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
68 |
static boolean debug = false; |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
69 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
70 |
/* |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
71 |
* If the client or server is doing some kind of object creation |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
72 |
* that the other side depends on, and that thread prematurely |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
73 |
* exits, you may experience a hang. The test harness will |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
74 |
* terminate all hung threads after its timeout has expired, |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
75 |
* currently 3 minutes by default, but you might try to be |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
76 |
* smart about it.... |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
77 |
*/ |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
78 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
79 |
/* |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
80 |
* Define the server side of the test. |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
81 |
* |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
82 |
* If the server prematurely exits, serverReady will be set to true |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
83 |
* to avoid infinite hangs. |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
84 |
*/ |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
85 |
void doServerSide() throws Exception { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
86 |
SSLServerSocketFactory sslssf = |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
87 |
(SSLServerSocketFactory) SSLServerSocketFactory.getDefault(); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
88 |
SSLServerSocket sslServerSocket = |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
89 |
(SSLServerSocket) sslssf.createServerSocket(serverPort); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
90 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
91 |
serverPort = sslServerSocket.getLocalPort(); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
92 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
93 |
/* |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
94 |
* Signal Client, we're ready for his connect. |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
95 |
*/ |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
96 |
serverReady = true; |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
97 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
98 |
try (SSLSocket sslSocket = (SSLSocket)sslServerSocket.accept()) { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
99 |
InputStream sslIS = sslSocket.getInputStream(); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
100 |
OutputStream sslOS = sslSocket.getOutputStream(); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
101 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
102 |
sslIS.read(); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
103 |
sslOS.write(85); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
104 |
sslOS.flush(); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
105 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
106 |
throw new Exception( |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
107 |
"Leagcy DH keys (< 1024) should be restricted"); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
108 |
} catch (SSLHandshakeException she) { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
109 |
// ignore, client should terminate the connection |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
110 |
} finally { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
111 |
sslServerSocket.close(); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
112 |
} |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
113 |
} |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
114 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
115 |
/* |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
116 |
* Define the client side of the test. |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
117 |
* |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
118 |
* If the server prematurely exits, serverReady will be set to true |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
119 |
* to avoid infinite hangs. |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
120 |
*/ |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
121 |
void doClientSide() throws Exception { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
122 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
123 |
/* |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
124 |
* Wait for server to get started. |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
125 |
*/ |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
126 |
while (!serverReady) { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
127 |
Thread.sleep(50); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
128 |
} |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
129 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
130 |
SSLSocketFactory sslsf = |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
131 |
(SSLSocketFactory) SSLSocketFactory.getDefault(); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
132 |
SSLSocket sslSocket = (SSLSocket) |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
133 |
sslsf.createSocket("localhost", serverPort); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
134 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
135 |
String[] suites = new String [] {"TLS_DHE_RSA_WITH_AES_128_CBC_SHA"}; |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
136 |
sslSocket.setEnabledCipherSuites(suites); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
137 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
138 |
try { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
139 |
InputStream sslIS = sslSocket.getInputStream(); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
140 |
OutputStream sslOS = sslSocket.getOutputStream(); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
141 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
142 |
sslOS.write(280); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
143 |
sslOS.flush(); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
144 |
sslIS.read(); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
145 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
146 |
throw new Exception("Leagcy DH keys (< 1024) should be restricted"); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
147 |
} catch (SSLHandshakeException she) { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
148 |
// ignore, should be caused by algorithm constraints |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
149 |
} finally { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
150 |
sslSocket.close(); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
151 |
} |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
152 |
} |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
153 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
154 |
/* |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
155 |
* ============================================================= |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
156 |
* The remainder is just support stuff |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
157 |
*/ |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
158 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
159 |
// use any free port by default |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
160 |
volatile int serverPort = 0; |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
161 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
162 |
volatile Exception serverException = null; |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
163 |
volatile Exception clientException = null; |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
164 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
165 |
public static void main(String[] args) throws Exception { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
166 |
String keyFilename = |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
167 |
System.getProperty("test.src", ".") + "/" + pathToStores + |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
168 |
"/" + keyStoreFile; |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
169 |
String trustFilename = |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
170 |
System.getProperty("test.src", ".") + "/" + pathToStores + |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
171 |
"/" + trustStoreFile; |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
172 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
173 |
System.setProperty("javax.net.ssl.keyStore", keyFilename); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
174 |
System.setProperty("javax.net.ssl.keyStorePassword", passwd); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
175 |
System.setProperty("javax.net.ssl.trustStore", trustFilename); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
176 |
System.setProperty("javax.net.ssl.trustStorePassword", passwd); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
177 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
178 |
if (debug) { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
179 |
System.setProperty("javax.net.debug", "all"); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
180 |
} |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
181 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
182 |
/* |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
183 |
* Start the tests. |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
184 |
*/ |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
185 |
new LegacyDHEKeyExchange(); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
186 |
} |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
187 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
188 |
Thread clientThread = null; |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
189 |
Thread serverThread = null; |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
190 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
191 |
/* |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
192 |
* Primary constructor, used to drive remainder of the test. |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
193 |
* |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
194 |
* Fork off the other side, then do your work. |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
195 |
*/ |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
196 |
LegacyDHEKeyExchange() throws Exception { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
197 |
Exception startException = null; |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
198 |
try { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
199 |
if (separateServerThread) { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
200 |
startServer(true); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
201 |
startClient(false); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
202 |
} else { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
203 |
startClient(true); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
204 |
startServer(false); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
205 |
} |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
206 |
} catch (Exception e) { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
207 |
startException = e; |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
208 |
} |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
209 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
210 |
/* |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
211 |
* Wait for other side to close down. |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
212 |
*/ |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
213 |
if (separateServerThread) { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
214 |
if (serverThread != null) { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
215 |
serverThread.join(); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
216 |
} |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
217 |
} else { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
218 |
if (clientThread != null) { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
219 |
clientThread.join(); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
220 |
} |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
221 |
} |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
222 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
223 |
/* |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
224 |
* When we get here, the test is pretty much over. |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
225 |
* Which side threw the error? |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
226 |
*/ |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
227 |
Exception local; |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
228 |
Exception remote; |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
229 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
230 |
if (separateServerThread) { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
231 |
remote = serverException; |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
232 |
local = clientException; |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
233 |
} else { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
234 |
remote = clientException; |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
235 |
local = serverException; |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
236 |
} |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
237 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
238 |
Exception exception = null; |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
239 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
240 |
/* |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
241 |
* Check various exception conditions. |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
242 |
*/ |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
243 |
if ((local != null) && (remote != null)) { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
244 |
// If both failed, return the curthread's exception. |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
245 |
local.initCause(remote); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
246 |
exception = local; |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
247 |
} else if (local != null) { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
248 |
exception = local; |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
249 |
} else if (remote != null) { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
250 |
exception = remote; |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
251 |
} else if (startException != null) { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
252 |
exception = startException; |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
253 |
} |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
254 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
255 |
/* |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
256 |
* If there was an exception *AND* a startException, |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
257 |
* output it. |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
258 |
*/ |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
259 |
if (exception != null) { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
260 |
if (exception != startException && startException != null) { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
261 |
exception.addSuppressed(startException); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
262 |
} |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
263 |
throw exception; |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
264 |
} |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
265 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
266 |
// Fall-through: no exception to throw! |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
267 |
} |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
268 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
269 |
void startServer(boolean newThread) throws Exception { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
270 |
if (newThread) { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
271 |
serverThread = new Thread() { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
272 |
@Override |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
273 |
public void run() { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
274 |
try { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
275 |
doServerSide(); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
276 |
} catch (Exception e) { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
277 |
/* |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
278 |
* Our server thread just died. |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
279 |
* |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
280 |
* Release the client, if not active already... |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
281 |
*/ |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
282 |
System.err.println("Server died..."); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
283 |
serverReady = true; |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
284 |
serverException = e; |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
285 |
} |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
286 |
} |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
287 |
}; |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
288 |
serverThread.start(); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
289 |
} else { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
290 |
try { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
291 |
doServerSide(); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
292 |
} catch (Exception e) { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
293 |
serverException = e; |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
294 |
} finally { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
295 |
serverReady = true; |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
296 |
} |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
297 |
} |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
298 |
} |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
299 |
|
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
300 |
void startClient(boolean newThread) throws Exception { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
301 |
if (newThread) { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
302 |
clientThread = new Thread() { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
303 |
@Override |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
304 |
public void run() { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
305 |
try { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
306 |
doClientSide(); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
307 |
} catch (Exception e) { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
308 |
/* |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
309 |
* Our client thread just died. |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
310 |
*/ |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
311 |
System.err.println("Client died..."); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
312 |
clientException = e; |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
313 |
} |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
314 |
} |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
315 |
}; |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
316 |
clientThread.start(); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
317 |
} else { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
318 |
try { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
319 |
doClientSide(); |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
320 |
} catch (Exception e) { |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
321 |
clientException = e; |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
322 |
} |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
323 |
} |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
324 |
} |
956bfe0cb926
8148108: Disable Diffie-Hellman keys less than 1024 bits
xuelei
parents:
diff
changeset
|
325 |
} |