Mercurial > 510Connectbot

comparison app/src/main/java/ch/ethz/ssh2/transport/ClientKexManager.java @ 510:7953570e5210

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update to ganymed-ssh2 tag 263 and fix hmac-sha2-512
author Carl Byington <carl@five-ten-sg.com>
date Wed, 01 Feb 2023 17:55:29 -0700
parents d29cce60f393
children
comparison
equal deleted inserted replaced
509:2eb4fa13b9ef 510:7953570e5210
159 return; 159 return;
160 } 160 }
161 161
162 if (kxs.np.kex_algo.equals("diffie-hellman-group1-sha1") || 162 if (kxs.np.kex_algo.equals("diffie-hellman-group1-sha1") ||
163 kxs.np.kex_algo.equals("diffie-hellman-group14-sha1") || 163 kxs.np.kex_algo.equals("diffie-hellman-group14-sha1") ||
164 kxs.np.kex_algo.equals("diffie-hellman-group14-sha256") ||
165 kxs.np.kex_algo.equals("diffie-hellman-group16-sha512") ||
166 kxs.np.kex_algo.equals("diffie-hellman-group18-sha512") ||
164 kxs.np.kex_algo.equals("ecdh-sha2-nistp256") || 167 kxs.np.kex_algo.equals("ecdh-sha2-nistp256") ||
165 kxs.np.kex_algo.equals("ecdh-sha2-nistp384") || 168 kxs.np.kex_algo.equals("ecdh-sha2-nistp384") ||
166 kxs.np.kex_algo.equals("ecdh-sha2-nistp521")) { 169 kxs.np.kex_algo.equals("ecdh-sha2-nistp521")) {
167 kxs.dhx = GenericDhExchange.getInstance(kxs.np.kex_algo); 170 kxs.dhx = GenericDhExchange.getInstance(kxs.np.kex_algo);
168 kxs.dhx.init(kxs.np.kex_algo); 171 kxs.dhx.init(kxs.np.kex_algo);
280 throw new IllegalStateException("Illegal State in KEX Exchange!"); 283 throw new IllegalStateException("Illegal State in KEX Exchange!");
281 } 284 }
282 285
283 if (kxs.np.kex_algo.equals("diffie-hellman-group1-sha1") || 286 if (kxs.np.kex_algo.equals("diffie-hellman-group1-sha1") ||
284 kxs.np.kex_algo.equals("diffie-hellman-group14-sha1") || 287 kxs.np.kex_algo.equals("diffie-hellman-group14-sha1") ||
288 kxs.np.kex_algo.equals("diffie-hellman-group14-sha256") ||
289 kxs.np.kex_algo.equals("diffie-hellman-group16-sha512") ||
290 kxs.np.kex_algo.equals("diffie-hellman-group18-sha512") ||
285 kxs.np.kex_algo.equals("ecdh-sha2-nistp256") || 291 kxs.np.kex_algo.equals("ecdh-sha2-nistp256") ||
286 kxs.np.kex_algo.equals("ecdh-sha2-nistp384") || 292 kxs.np.kex_algo.equals("ecdh-sha2-nistp384") ||
287 kxs.np.kex_algo.equals("ecdh-sha2-nistp521")) { 293 kxs.np.kex_algo.equals("ecdh-sha2-nistp521")) {
288 if (kxs.state == 1) { 294 if (kxs.state == 1) {
289 PacketKexDHReply dhr = new PacketKexDHReply(msg); 295 PacketKexDHReply dhr = new PacketKexDHReply(msg);