diff options
| author | djm <djm> | 2011-01-06 11:44:44 +0000 |
|---|---|---|
| committer | djm <djm> | 2011-01-06 11:44:44 +0000 |
| commit | af07d053955ea100847f0722b9c42fd95cc01bb8 (patch) | |
| tree | 3002fbcc23296b28d8bcf16f21632aaf600a75b6 /ssh-keyscan.c | |
| parent | f38445c354afe5676bf730a5b971303700d18d3e (diff) | |
| download | openssh-af07d053955ea100847f0722b9c42fd95cc01bb8.tar.gz | |
- otto@cvs.openbsd.org 2011/01/04 20:44:13
[ssh-keyscan.c]
handle ecdsa-sha2 with various key lengths; hint and ok djm@
Diffstat (limited to 'ssh-keyscan.c')
| -rw-r--r-- | ssh-keyscan.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ssh-keyscan.c b/ssh-keyscan.c index 3fb1214e..25d7ac66 100644 --- a/ssh-keyscan.c +++ b/ssh-keyscan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keyscan.c,v 1.83 2010/08/31 11:54:45 djm Exp $ */ +/* $OpenBSD: ssh-keyscan.c,v 1.84 2011/01/04 20:44:13 otto Exp $ */ /* * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. * @@ -246,7 +246,8 @@ keygrab_ssh2(con *c) packet_set_connection(c->c_fd, c->c_fd); enable_compat20(); myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = c->c_keytype == KT_DSA? - "ssh-dss": "ssh-rsa"; + "ssh-dss" : (c->c_keytype == KT_RSA ? "ssh-rsa" : + "ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521"); c->c_kex = kex_setup(myproposal); c->c_kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client; c->c_kex->kex[KEX_DH_GRP14_SHA1] = kexdh_client; @@ -573,7 +574,7 @@ do_host(char *host) if (name == NULL) return; - for (j = KT_RSA1; j <= KT_RSA; j *= 2) { + for (j = KT_RSA1; j <= KT_ECDSA; j *= 2) { if (get_keytypes & j) { while (ncon >= MAXCON) conloop(); |