src/usr.bin/ssh/ssh-keyscan.c - diff

Return to ssh-keyscan.c CVS log

Up to [local] / src / usr.bin / ssh

version 1.91, 2014/03/27 23:01:27

version 1.92, 2014/04/29 18:01:49

Line 167

return (tok);

}

#ifdef WITH_SSH1

static Key *

keygrab_ssh1(con *c)

{

Line 200

Line 201

return (rsa);

}

#endif

static int

hostjump(Key *hostkey)

Line 238

Line 240

(c->c_keytype == KT_ED25519 ? "ssh-ed25519" :

"ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521"));

c->c_kex = kex_setup(myproposal);

#ifdef WITH_OPENSSL

c->c_kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client;

c->c_kex->kex[KEX_DH_GRP14_SHA1] = kexdh_client;

c->c_kex->kex[KEX_DH_GEX_SHA1] = kexgex_client;

c->c_kex->kex[KEX_DH_GEX_SHA256] = kexgex_client;

c->c_kex->kex[KEX_ECDH_SHA2] = kexecdh_client;

#endif

c->c_kex->kex[KEX_C25519_SHA256] = kexc25519_client;

c->c_kex->verify_host_key = hostjump;

Line 492

Line 496

c->c_data = xmalloc(c->c_len);

c->c_status = CS_KEYS;

break;

#ifdef WITH_SSH1

case CS_KEYS:

keyprint(c, keygrab_ssh1(c));

confree(s);

return;

#endif

default:

fatal("conread: invalid status %d", c->c_status);

break;