diff options
| author | des <des@FreeBSD.org> | 2014-01-30 10:56:49 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2014-01-30 10:56:49 +0000 |
| commit | 45d0197dd79eceffb5bbc29f75199eb09af5a5f9 (patch) | |
| tree | 6c519c109631364b652faced88b665da4b6058ae /monitor.c | |
| parent | 31fac2f7108f657f455d571b94ed1a5c86d075b2 (diff) | |
| download | FreeBSD-src-45d0197dd79eceffb5bbc29f75199eb09af5a5f9.zip FreeBSD-src-45d0197dd79eceffb5bbc29f75199eb09af5a5f9.tar.gz | |
Vendor import of OpenSSH 6.5p1.
Diffstat (limited to 'monitor.c')
| -rw-r--r-- | monitor.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: monitor.c,v 1.127 2013/07/19 07:37:48 markus Exp $ */ +/* $OpenBSD: monitor.c,v 1.128 2013/11/04 11:51:16 markus Exp $ */ /* * Copyright 2002 Niels Provos <provos@citi.umich.edu> * Copyright 2002 Markus Friedl <markus@openbsd.org> @@ -1855,6 +1855,7 @@ mm_get_kex(Buffer *m) kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; kex->kex[KEX_ECDH_SHA2] = kexecdh_server; + kex->kex[KEX_C25519_SHA256] = kexc25519_server; kex->server = 1; kex->hostkey_type = buffer_get_int(m); kex->kex_type = buffer_get_int(m); |
