diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2014-01-30 10:56:49 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2014-01-30 10:56:49 +0000 |
| commit | 02d4c2ac3daa0f36264392972709ccd7676ab3e8 (patch) | |
| tree | 6c519c109631364b652faced88b665da4b6058ae /monitor.c | |
| parent | ff96c0c81d9ee141236b95d52ad0578684d59ab5 (diff) | |
| download | src-02d4c2ac3daa0f36264392972709ccd7676ab3e8.tar.gz src-02d4c2ac3daa0f36264392972709ccd7676ab3e8.zip | |
Vendor import of OpenSSH 6.5p1.vendor/openssh/6.5p1
Notes
Notes:
svn path=/vendor-crypto/openssh/dist/; revision=261287
svn path=/vendor-crypto/openssh/6.5p1/; revision=261288; tag=vendor/openssh/6.5p1
Diffstat (limited to 'monitor.c')
| -rw-r--r-- | monitor.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/monitor.c b/monitor.c index 44dff98c93c0..03baf1ea9c95 100644 --- a/monitor.c +++ b/monitor.c @@ -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); |