RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- otto@cvs.openbsd.org 2011/01/04 20:44:13 

[ssh-keyscan.c]
     handle ecdsa-sha2 with various key lengths; hint and ok djm@
This commit is contained in:
Damien Miller 2011-01-06 22:44:44 +11:00
parent de53fd04b1
commit 8ad960b4ba
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -22,6 +22,9 @@
- djm@cvs.openbsd.org 2010/12/24 21:41:48 - djm@cvs.openbsd.org 2010/12/24 21:41:48
[auth-options.c] [auth-options.c]
don't send the actual forced command in a debug message; ok markus deraadt don't send the actual forced command in a debug message; ok markus deraadt
- otto@cvs.openbsd.org 2011/01/04 20:44:13
[ssh-keyscan.c]
handle ecdsa-sha2 with various key lengths; hint and ok djm@
20110104 20110104
- (djm) [configure.ac Makefile.in] Use mandoc as preferred manpage - (djm) [configure.ac Makefile.in] Use mandoc as preferred manpage

7
ssh-keyscan.c
View File

@ -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>. * 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); packet_set_connection(c->c_fd, c->c_fd);
enable_compat20(); enable_compat20();
myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = c->c_keytype == KT_DSA? 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_setup(myproposal);
c->c_kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client; 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_GRP14_SHA1] = kexdh_client;
@ -573,7 +574,7 @@ do_host(char *host)
if (name == NULL) if (name == NULL)
return; return;
for (j = KT_RSA1; j <= KT_RSA; j *= 2) { for (j = KT_RSA1; j <= KT_ECDSA; j *= 2) {
if (get_keytypes & j) { if (get_keytypes & j) {
while (ncon >= MAXCON) while (ncon >= MAXCON)
conloop(); conloop();