Mercurial > 510Connectbot

annotate src/ch/ethz/ssh2/transport/ClientKexManager.java @ 417:4dcc071e1feb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
monitor failure should not kill the TE
author Carl Byington <carl@five-ten-sg.com>
date Wed, 29 Oct 2014 12:12:48 -0700
parents 2768eb029d73
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
1 /*
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
2 * Copyright (c) 2006-2013 Christian Plattner. All rights reserved.
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
3 * Please refer to the LICENSE.txt for licensing details.
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
4 */
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
5 package ch.ethz.ssh2.transport;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
6
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
7 import java.io.IOException;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
8 import java.security.DigestException;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
9 import java.security.SecureRandom;
305
d2b303406d63 remove extra override annotations that generate eclipse compiler errors
Carl Byington <carl@five-ten-sg.com>
parents: 298
diff changeset
10 import java.security.interfaces.DSAPublicKey;
d2b303406d63 remove extra override annotations that generate eclipse compiler errors
Carl Byington <carl@five-ten-sg.com>
parents: 298
diff changeset
11 import java.security.interfaces.ECPublicKey;
d2b303406d63 remove extra override annotations that generate eclipse compiler errors
Carl Byington <carl@five-ten-sg.com>
parents: 298
diff changeset
12 import java.security.interfaces.RSAPublicKey;
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
13
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
14 import ch.ethz.ssh2.ConnectionInfo;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
15 import ch.ethz.ssh2.PacketTypeException;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
16 import ch.ethz.ssh2.ServerHostKeyVerifier;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
17 import ch.ethz.ssh2.compression.CompressionFactory;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
18 import ch.ethz.ssh2.compression.Compressor;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
19 import ch.ethz.ssh2.crypto.CryptoWishList;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
20 import ch.ethz.ssh2.crypto.cipher.BlockCipher;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
21 import ch.ethz.ssh2.crypto.cipher.BlockCipherFactory;
310
9e42082d1f93 add ecdsa key support everywhere
Carl Byington <carl@five-ten-sg.com>
parents: 308
diff changeset
22 import ch.ethz.ssh2.crypto.dh.GenericDhExchange;
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
23 import ch.ethz.ssh2.crypto.dh.DhGroupExchange;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
24 import ch.ethz.ssh2.crypto.digest.MAC;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
25 import ch.ethz.ssh2.packets.PacketKexDHInit;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
26 import ch.ethz.ssh2.packets.PacketKexDHReply;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
27 import ch.ethz.ssh2.packets.PacketKexDhGexGroup;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
28 import ch.ethz.ssh2.packets.PacketKexDhGexInit;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
29 import ch.ethz.ssh2.packets.PacketKexDhGexReply;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
30 import ch.ethz.ssh2.packets.PacketKexDhGexRequest;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
31 import ch.ethz.ssh2.packets.PacketKexDhGexRequestOld;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
32 import ch.ethz.ssh2.packets.PacketKexInit;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
33 import ch.ethz.ssh2.packets.Packets;
281
b4ca341c318d start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents: 278
diff changeset
34 import ch.ethz.ssh2.signature.DSASHA1Verify;
282
c3019725b123 start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents: 281
diff changeset
35 import ch.ethz.ssh2.signature.ECDSASHA2Verify;
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
36 import ch.ethz.ssh2.signature.RSASHA1Verify;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
37
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
38 /**
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
39 * @version $Id: ClientKexManager.java 160 2014-05-01 14:30:26Z dkocher@sudo.ch $
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
40 */
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
41 public class ClientKexManager extends KexManager {
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
42
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
43 private final ServerHostKeyVerifier verifier;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
44
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
45 private final String hostname;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
46
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
47 private final int port;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
48
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
49 public ClientKexManager(TransportManager tm, ClientServerHello csh, CryptoWishList initialCwl, String hostname, int port,
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
50 ServerHostKeyVerifier keyVerifier, SecureRandom rnd) {
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
51 super(tm, csh, initialCwl, rnd);
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
52 this.hostname = hostname;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
53 this.port = port;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
54 this.verifier = keyVerifier;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
55 }
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
56
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
57 protected boolean verifySignature(byte[] sig, byte[] hostkey) throws IOException {
284
4ec87de11e71 start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents: 282
diff changeset
58 if (kxs.np.server_host_key_algo.startsWith("ecdsa-sha2-")) {
4ec87de11e71 start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents: 282
diff changeset
59 byte[] rs = ECDSASHA2Verify.decodeSSHECDSASignature(sig);
4ec87de11e71 start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents: 282
diff changeset
60 ECPublicKey epk = ECDSASHA2Verify.decodeSSHECDSAPublicKey(hostkey);
287
db9b028016de start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents: 285
diff changeset
61 log.debug("Verifying ecdsa signature");
284
4ec87de11e71 start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents: 282
diff changeset
62 return ECDSASHA2Verify.verifySignature(kxs.H, rs, epk);
4ec87de11e71 start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents: 282
diff changeset
63 }
298
ab3a99f11a36 add ecdsa key support everywhere
Carl Byington <carl@five-ten-sg.com>
parents: 287
diff changeset
64
284
4ec87de11e71 start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents: 282
diff changeset
65 if (kxs.np.server_host_key_algo.equals("ssh-rsa")) {
4ec87de11e71 start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents: 282
diff changeset
66 byte[] rs = RSASHA1Verify.decodeSSHRSASignature(sig);
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
67 RSAPublicKey rpk = RSASHA1Verify.decodeSSHRSAPublicKey(hostkey);
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
68 log.debug("Verifying ssh-rsa signature");
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
69 return RSASHA1Verify.verifySignature(kxs.H, rs, rpk);
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
70 }
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
71
284
4ec87de11e71 start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents: 282
diff changeset
72 if (kxs.np.server_host_key_algo.equals("ssh-dss")) {
4ec87de11e71 start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents: 282
diff changeset
73 byte[] ds = DSASHA1Verify.decodeSSHDSASignature(sig);
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
74 DSAPublicKey dpk = DSASHA1Verify.decodeSSHDSAPublicKey(hostkey);
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
75 log.debug("Verifying ssh-dss signature");
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
76 return DSASHA1Verify.verifySignature(kxs.H, ds, dpk);
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
77 }
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
78
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
79 throw new IOException("Unknown server host key algorithm '" + kxs.np.server_host_key_algo + "'");
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
80 }
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
81
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
82 public void handleFailure(final IOException failure) {
330
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
83 synchronized (accessLock) {
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
84 connectionClosed = true;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
85 accessLock.notifyAll();
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
86 }
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
87 }
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
88
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
89 public synchronized void handleMessage(byte[] msg) throws IOException {
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
90 PacketKexInit kip;
366
098bb036e0a7 fix typo in key exchange hash algorithm type
Carl Byington <carl@five-ten-sg.com>
parents: 333
diff changeset
91
306
90e47d99ea54 add ecdsa key support everywhere
Carl Byington <carl@five-ten-sg.com>
parents: 305
diff changeset
92 if (msg == null) {
90e47d99ea54 add ecdsa key support everywhere
Carl Byington <carl@five-ten-sg.com>
parents: 305
diff changeset
93 synchronized (accessLock) {
90e47d99ea54 add ecdsa key support everywhere
Carl Byington <carl@five-ten-sg.com>
parents: 305
diff changeset
94 connectionClosed = true;
90e47d99ea54 add ecdsa key support everywhere
Carl Byington <carl@five-ten-sg.com>
parents: 305
diff changeset
95 accessLock.notifyAll();
90e47d99ea54 add ecdsa key support everywhere
Carl Byington <carl@five-ten-sg.com>
parents: 305
diff changeset
96 return;
90e47d99ea54 add ecdsa key support everywhere
Carl Byington <carl@five-ten-sg.com>
parents: 305
diff changeset
97 }
90e47d99ea54 add ecdsa key support everywhere
Carl Byington <carl@five-ten-sg.com>
parents: 305
diff changeset
98 }
366
098bb036e0a7 fix typo in key exchange hash algorithm type
Carl Byington <carl@five-ten-sg.com>
parents: 333
diff changeset
99
333
d835e842d158 still hangs during connection
Carl Byington <carl@five-ten-sg.com>
parents: 330
diff changeset
100 log.debug(String.format("client kex manager, packet type %d", msg[0]));
306
90e47d99ea54 add ecdsa key support everywhere
Carl Byington <carl@five-ten-sg.com>
parents: 305
diff changeset
101
330
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
102 if ((kxs == null) && (msg[0] != Packets.SSH_MSG_KEXINIT)) {
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
103 throw new PacketTypeException(msg[0]);
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
104 }
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
105
330
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
106 if (ignore_next_kex_packet) {
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
107 ignore_next_kex_packet = false;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
108 return;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
109 }
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
110
330
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
111 if (msg[0] == Packets.SSH_MSG_KEXINIT) {
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
112 if ((kxs != null) && (kxs.state != 0)) {
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
113 throw new PacketTypeException(msg[0]);
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
114 }
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
115
330
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
116 if (kxs == null) {
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
117 /*
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
118 * Ah, OK, peer wants to do KEX. Let's be nice and play
330
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
119 * together.
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
120 */
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
121 kxs = new KexState();
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
122 kxs.dhgexParameters = nextKEXdhgexParameters;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
123 kip = new PacketKexInit(nextKEXcryptoWishList, rnd);
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
124 kxs.localKEX = kip;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
125 tm.sendKexMessage(kip.getPayload());
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
126 }
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
127
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
128 kip = new PacketKexInit(msg);
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
129 kxs.remoteKEX = kip;
329
6896bfafa510 add ecdsa key support everywhere
Carl Byington <carl@five-ten-sg.com>
parents: 314
diff changeset
130 kxs.np = mergeKexParameters(kxs.localKEX.getKexParameters(), kxs.remoteKEX.getKexParameters());
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
131
329
6896bfafa510 add ecdsa key support everywhere
Carl Byington <carl@five-ten-sg.com>
parents: 314
diff changeset
132 if (kxs.np == null)
6896bfafa510 add ecdsa key support everywhere
Carl Byington <carl@five-ten-sg.com>
parents: 314
diff changeset
133 throw new IOException("Cannot negotiate, proposals do not match.");
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
134
330
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
135 if (kxs.remoteKEX.isFirst_kex_packet_follows() && (kxs.np.guessOK == false)) {
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
136 // Guess was wrong, we need to ignore the next kex packet.
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
137 ignore_next_kex_packet = true;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
138 }
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
139
306
90e47d99ea54 add ecdsa key support everywhere
Carl Byington <carl@five-ten-sg.com>
parents: 305
diff changeset
140 if (kxs.np.kex_algo.equals("diffie-hellman-group-exchange-sha1") ||
330
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
141 kxs.np.kex_algo.equals("diffie-hellman-group-exchange-sha256")) {
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
142 if (kxs.dhgexParameters.getMin_group_len() == 0) {
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
143 PacketKexDhGexRequestOld dhgexreq = new PacketKexDhGexRequestOld(kxs.dhgexParameters);
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
144 tm.sendKexMessage(dhgexreq.getPayload());
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
145 }
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
146 else {
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
147 PacketKexDhGexRequest dhgexreq = new PacketKexDhGexRequest(kxs.dhgexParameters);
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
148 tm.sendKexMessage(dhgexreq.getPayload());
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
149 }
330
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
150
306
90e47d99ea54 add ecdsa key support everywhere
Carl Byington <carl@five-ten-sg.com>
parents: 305
diff changeset
151 if (kxs.np.kex_algo.endsWith("sha1")) {
90e47d99ea54 add ecdsa key support everywhere
Carl Byington <carl@five-ten-sg.com>
parents: 305
diff changeset
152 kxs.hashAlgo = "SHA1";
90e47d99ea54 add ecdsa key support everywhere
Carl Byington <carl@five-ten-sg.com>
parents: 305
diff changeset
153 }
90e47d99ea54 add ecdsa key support everywhere
Carl Byington <carl@five-ten-sg.com>
parents: 305
diff changeset
154 else {
366
098bb036e0a7 fix typo in key exchange hash algorithm type
Carl Byington <carl@five-ten-sg.com>
parents: 333
diff changeset
155 kxs.hashAlgo = "SHA2";
306
90e47d99ea54 add ecdsa key support everywhere
Carl Byington <carl@five-ten-sg.com>
parents: 305
diff changeset
156 }
330
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
157
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
158 kxs.state = 1;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
159 return;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
160 }
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
161
306
90e47d99ea54 add ecdsa key support everywhere
Carl Byington <carl@five-ten-sg.com>
parents: 305
diff changeset
162 if (kxs.np.kex_algo.equals("diffie-hellman-group1-sha1") ||
373
2768eb029d73 debug kex error
Carl Byington <carl@five-ten-sg.com>
parents: 366
diff changeset
163 kxs.np.kex_algo.equals("diffie-hellman-group14-sha1") ||
2768eb029d73 debug kex error
Carl Byington <carl@five-ten-sg.com>
parents: 366
diff changeset
164 kxs.np.kex_algo.equals("ecdh-sha2-nistp256") ||
2768eb029d73 debug kex error
Carl Byington <carl@five-ten-sg.com>
parents: 366
diff changeset
165 kxs.np.kex_algo.equals("ecdh-sha2-nistp384") ||
2768eb029d73 debug kex error
Carl Byington <carl@five-ten-sg.com>
parents: 366
diff changeset
166 kxs.np.kex_algo.equals("ecdh-sha2-nistp521")) {
306
90e47d99ea54 add ecdsa key support everywhere
Carl Byington <carl@five-ten-sg.com>
parents: 305
diff changeset
167 kxs.dhx = GenericDhExchange.getInstance(kxs.np.kex_algo);
90e47d99ea54 add ecdsa key support everywhere
Carl Byington <carl@five-ten-sg.com>
parents: 305
diff changeset
168 kxs.dhx.init(kxs.np.kex_algo);
329
6896bfafa510 add ecdsa key support everywhere
Carl Byington <carl@five-ten-sg.com>
parents: 314
diff changeset
169 kxs.hashAlgo = kxs.dhx.getHashAlgo();
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
170 PacketKexDHInit kp = new PacketKexDHInit(kxs.dhx.getE());
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
171 tm.sendKexMessage(kp.getPayload());
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
172 kxs.state = 1;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
173 return;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
174 }
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
175
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
176 throw new IllegalStateException("Unkown KEX method!");
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
177 }
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
178
329
6896bfafa510 add ecdsa key support everywhere
Carl Byington <carl@five-ten-sg.com>
parents: 314
diff changeset
179 if (msg[0] == Packets.SSH_MSG_NEWKEYS) {
6896bfafa510 add ecdsa key support everywhere
Carl Byington <carl@five-ten-sg.com>
parents: 314
diff changeset
180 if (km == null) {
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
181 throw new IOException("Peer sent SSH_MSG_NEWKEYS, but I have no key material ready!");
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
182 }
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
183
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
184 BlockCipher cbc;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
185 MAC mac;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
186 Compressor comp;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
187
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
188 try {
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
189 cbc = BlockCipherFactory.createCipher(kxs.np.enc_algo_server_to_client, false,
330
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
190 km.enc_key_server_to_client, km.initial_iv_server_to_client);
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
191
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
192 try {
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
193 mac = new MAC(kxs.np.mac_algo_server_to_client, km.integrity_key_server_to_client);
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
194 }
330
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
195 catch (DigestException e) {
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
196 throw new IOException(e);
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
197 }
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
198
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
199 comp = CompressionFactory.createCompressor(kxs.np.comp_algo_server_to_client);
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
200 }
330
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
201 catch (IllegalArgumentException e) {
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
202 throw new IOException(e.getMessage());
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
203 }
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
204
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
205 tm.changeRecvCipher(cbc, mac);
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
206 tm.changeRecvCompression(comp);
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
207 ConnectionInfo sci = new ConnectionInfo();
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
208 kexCount++;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
209 sci.keyExchangeAlgorithm = kxs.np.kex_algo;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
210 sci.keyExchangeCounter = kexCount;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
211 sci.clientToServerCryptoAlgorithm = kxs.np.enc_algo_client_to_server;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
212 sci.serverToClientCryptoAlgorithm = kxs.np.enc_algo_server_to_client;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
213 sci.clientToServerMACAlgorithm = kxs.np.mac_algo_client_to_server;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
214 sci.serverToClientMACAlgorithm = kxs.np.mac_algo_server_to_client;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
215 sci.serverHostKeyAlgorithm = kxs.np.server_host_key_algo;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
216 sci.serverHostKey = kxs.remote_hostkey;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
217
330
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
218 synchronized (accessLock) {
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
219 lastConnInfo = sci;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
220 accessLock.notifyAll();
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
221 }
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
222
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
223 kxs = null;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
224 return;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
225 }
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
226
330
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
227 if ((kxs == null) || (kxs.state == 0)) {
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
228 throw new IOException("Unexpected Kex submessage!");
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
229 }
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
230
306
90e47d99ea54 add ecdsa key support everywhere
Carl Byington <carl@five-ten-sg.com>
parents: 305
diff changeset
231 if (kxs.np.kex_algo.equals("diffie-hellman-group-exchange-sha1") ||
330
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
232 kxs.np.kex_algo.equals("diffie-hellman-group-exchange-sha256")) {
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
233 if (kxs.state == 1) {
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
234 PacketKexDhGexGroup dhgexgrp = new PacketKexDhGexGroup(msg);
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
235 kxs.dhgx = new DhGroupExchange(dhgexgrp.getP(), dhgexgrp.getG());
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
236 kxs.dhgx.init(rnd);
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
237 PacketKexDhGexInit dhgexinit = new PacketKexDhGexInit(kxs.dhgx.getE());
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
238 tm.sendKexMessage(dhgexinit.getPayload());
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
239 kxs.state = 2;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
240 return;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
241 }
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
242
330
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
243 if (kxs.state == 2) {
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
244 PacketKexDhGexReply dhgexrpl = new PacketKexDhGexReply(msg);
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
245 kxs.remote_hostkey = dhgexrpl.getHostKey();
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
246
330
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
247 if (verifier != null) {
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
248 try {
330
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
249 if (!verifier.verifyServerHostKey(hostname, port, kxs.np.server_host_key_algo, kxs.remote_hostkey)) {
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
250 throw new IOException("The server host key was not accepted by the verifier callback");
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
251 }
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
252 }
330
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
253 catch (Exception e) {
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
254 throw new IOException(
330
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
255 "The server host key was not accepted by the verifier callback.", e);
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
256 }
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
257 }
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
258
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
259 kxs.dhgx.setF(dhgexrpl.getF());
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
260
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
261 try {
313
1d400fd78e4a add ecdsa key support everywhere
Carl Byington <carl@five-ten-sg.com>
parents: 312
diff changeset
262 kxs.H = kxs.dhgx.calculateH(kxs.hashAlgo, csh.getClientString(), csh.getServerString(),
330
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
263 kxs.localKEX.getPayload(), kxs.remoteKEX.getPayload(), dhgexrpl.getHostKey(),
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
264 kxs.dhgexParameters);
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
265 }
330
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
266 catch (IllegalArgumentException e) {
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
267 throw new IOException("KEX error.", e);
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
268 }
330
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
269
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
270 if (!verifySignature(dhgexrpl.getSignature(), kxs.remote_hostkey)) {
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
271 throw new IOException("Invalid remote host key signature");
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
272 }
330
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
273
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
274 kxs.K = kxs.dhgx.getK();
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
275 finishKex(true);
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
276 kxs.state = -1;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
277 return;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
278 }
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
279
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
280 throw new IllegalStateException("Illegal State in KEX Exchange!");
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
281 }
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
282
306
90e47d99ea54 add ecdsa key support everywhere
Carl Byington <carl@five-ten-sg.com>
parents: 305
diff changeset
283 if (kxs.np.kex_algo.equals("diffie-hellman-group1-sha1") ||
330
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
284 kxs.np.kex_algo.equals("diffie-hellman-group14-sha1") ||
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
285 kxs.np.kex_algo.equals("ecdh-sha2-nistp256") ||
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
286 kxs.np.kex_algo.equals("ecdh-sha2-nistp384") ||
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
287 kxs.np.kex_algo.equals("ecdh-sha2-nistp521")) {
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
288 if (kxs.state == 1) {
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
289 PacketKexDHReply dhr = new PacketKexDHReply(msg);
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
290 kxs.remote_hostkey = dhr.getHostKey();
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
291
330
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
292 if (verifier != null) {
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
293 try {
330
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
294 if (!verifier.verifyServerHostKey(hostname, port, kxs.np.server_host_key_algo, kxs.remote_hostkey)) {
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
295 throw new IOException("The server host key was not accepted by the verifier callback");
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
296 }
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
297 }
330
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
298 catch (Exception e) {
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
299 throw new IOException("The server host key was not accepted by the verifier callback", e);
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
300 }
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
301 }
330
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
302
313
1d400fd78e4a add ecdsa key support everywhere
Carl Byington <carl@five-ten-sg.com>
parents: 312
diff changeset
303 kxs.dhx.setF(dhr.getF().toByteArray());
330
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
304
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
305 try {
314
d85bc45139f2 add ecdsa key support everywhere
Carl Byington <carl@five-ten-sg.com>
parents: 313
diff changeset
306 kxs.H = kxs.dhx.calculateH(csh.getClientString(), csh.getServerString(), kxs.localKEX.getPayload(),
330
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
307 kxs.remoteKEX.getPayload(), dhr.getHostKey());
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
308 }
330
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
309 catch (IllegalArgumentException e) {
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
310 throw new IOException("KEX error.", e);
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
311 }
330
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
312
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
313 if (!verifySignature(dhr.getSignature(), kxs.remote_hostkey)) {
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
314 throw new IOException("Invalid remote host key signature");
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
315 }
330
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
316
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
317 kxs.K = kxs.dhx.getK();
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
318 finishKex(true);
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
319 kxs.state = -1;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
320 return;
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
321 }
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
322 }
330
6740870cf268 fix java formatting
Carl Byington <carl@five-ten-sg.com>
parents: 329
diff changeset
323
273
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
324 throw new IllegalStateException(String.format("Unknown KEX method %s", kxs.np.kex_algo));
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
325 }
91a31873c42a start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
diff changeset
326 }