summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkus <markus@openbsd.org>2013-11-04 11:51:16 +0000
committermarkus <markus@openbsd.org>2013-11-04 11:51:16 +0000
commit37dd1b553128f8c1e365ae6050f5b51002d72cda (patch)
tree055be78b38d9430d0c9e47706d69690c4a11a14c
parentregen (diff)
downloadwireguard-openbsd-37dd1b553128f8c1e365ae6050f5b51002d72cda.tar.xz
wireguard-openbsd-37dd1b553128f8c1e365ae6050f5b51002d72cda.zip
fix rekeying for KEX_C25519_SHA256; noted by dtucker@
-rw-r--r--usr.bin/ssh/monitor.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/ssh/monitor.c b/usr.bin/ssh/monitor.c
index 9c03bc98d45..076a87c1c09 100644
--- a/usr.bin/ssh/monitor.c
+++ b/usr.bin/ssh/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>
@@ -1524,6 +1524,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);