Mercurial > 510Connectbot

comparison src/ch/ethz/ssh2/transport/ClientKexManager.java @ 366:098bb036e0a7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix typo in key exchange hash algorithm type
author Carl Byington <carl@five-ten-sg.com>
date Mon, 04 Aug 2014 10:27:18 -0700
parents d835e842d158
children 2768eb029d73
comparison
equal deleted inserted replaced
365:145ec135804f 366:098bb036e0a7
86 } 86 }
87 } 87 }
88 88
89 public synchronized void handleMessage(byte[] msg) throws IOException { 89 public synchronized void handleMessage(byte[] msg) throws IOException {
90 PacketKexInit kip; 90 PacketKexInit kip;
91 91
92 if (msg == null) { 92 if (msg == null) {
93 synchronized (accessLock) { 93 synchronized (accessLock) {
94 connectionClosed = true; 94 connectionClosed = true;
95 accessLock.notifyAll(); 95 accessLock.notifyAll();
96 return; 96 return;
97 } 97 }
98 } 98 }
99 99
100 log.debug(String.format("client kex manager, packet type %d", msg[0])); 100 log.debug(String.format("client kex manager, packet type %d", msg[0]));
101 101
102 if ((kxs == null) && (msg[0] != Packets.SSH_MSG_KEXINIT)) { 102 if ((kxs == null) && (msg[0] != Packets.SSH_MSG_KEXINIT)) {
103 throw new PacketTypeException(msg[0]); 103 throw new PacketTypeException(msg[0]);
104 } 104 }
150 150
151 if (kxs.np.kex_algo.endsWith("sha1")) { 151 if (kxs.np.kex_algo.endsWith("sha1")) {
152 kxs.hashAlgo = "SHA1"; 152 kxs.hashAlgo = "SHA1";
153 } 153 }
154 else { 154 else {
155 kxs.hashAlgo = "SHA-256"; 155 kxs.hashAlgo = "SHA2";
156 } 156 }
157 157
158 kxs.state = 1; 158 kxs.state = 1;
159 return; 159 return;
160 } 160 }