diff options
| author | Jan Pechanec <Jan.Pechanec@Sun.COM> | 2008-09-12 11:17:27 -0700 |
|---|---|---|
| committer | Jan Pechanec <Jan.Pechanec@Sun.COM> | 2008-09-12 11:17:27 -0700 |
| commit | cd7d5faf5bbb52336a6f85578a90b31a648ac3fa (patch) | |
| tree | 9ac1635ecfe13f31666944f18e771bc4e9e58373 /usr/src/cmd/ssh/ssh-keyscan/ssh-keyscan.c | |
| parent | e4da943dc881d5566125b30eda2d8e3dd79a8f59 (diff) | |
| download | illumos-joyent-cd7d5faf5bbb52336a6f85578a90b31a648ac3fa.tar.gz | |
PSARC/2008/520 SunSSH with the OpenSSL PKCS#11 engine support
6445288 ssh needs to be OpenSSL engine aware
6709963 SunSSH server leaks memory during initialization
6687401 ssh monitor shouldn't try to log remote IP when child closed the pipe
6696629 sshd should remove alarm signal handler after authentication
6674088 userland threshold for hw offloading makes it difficult for SSL and SSH protocols
6728450 6708125 prevents parent to use the Crypto Framework after the fork(2)
6742247 ssh debug output with PACKET_DEBUG code could be more readable
Diffstat (limited to 'usr/src/cmd/ssh/ssh-keyscan/ssh-keyscan.c')
| -rw-r--r-- | usr/src/cmd/ssh/ssh-keyscan/ssh-keyscan.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr/src/cmd/ssh/ssh-keyscan/ssh-keyscan.c b/usr/src/cmd/ssh/ssh-keyscan/ssh-keyscan.c index 01fd90f825..19a2deb44c 100644 --- a/usr/src/cmd/ssh/ssh-keyscan/ssh-keyscan.c +++ b/usr/src/cmd/ssh/ssh-keyscan/ssh-keyscan.c @@ -1,8 +1,4 @@ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ -/* * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. * * Modification and redistribution in source and binary forms is @@ -10,11 +6,14 @@ * OpenBSD project by leaving this copyright notice intact. */ +/* + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. + */ + #include "includes.h" RCSID("$OpenBSD: ssh-keyscan.c,v 1.40 2002/07/06 17:47:58 stevesk Exp $"); -#pragma ident "%Z%%M% %I% %E% SMI" - #include "sys-queue.h" #include <openssl/bn.h> @@ -362,6 +361,7 @@ keygrab_ssh2(con *c) myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = c->c_keytype == KT_DSA? "ssh-dss": "ssh-rsa"; c->c_kex = kex_setup(c->c_name, myproposal, NULL); + kex_start(c->c_kex); c->c_kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client; c->c_kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; c->c_kex->verify_host_key = hostjump; |