From c98319750b0bbdd0d1794420ec97d65dd9244613 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Thu, 7 Nov 2013 12:00:23 +1100 Subject: - (djm) [Makefile.in monitor.c] Missed chunks of curve25519 KEX diff --- monitor.c | 1 + 1 file changed, 1 insertion(+) (limited to 'monitor.c') diff --git a/monitor.c b/monitor.c index 44dff98c9..328a605d9 100644 --- a/monitor.c +++ b/monitor.c @@ -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); -- cgit v1.2.3 From 67a8800f290b39fd60e379988c700656ae3f2539 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Thu, 7 Nov 2013 13:32:51 +1100 Subject: - markus@cvs.openbsd.org 2013/11/04 11:51:16 [monitor.c] fix rekeying for KEX_C25519_SHA256; noted by dtucker@ RCSID sync only; I thought this was a merge botch and fixed it already --- ChangeLog | 5 +++++ monitor.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'monitor.c') diff --git a/ChangeLog b/ChangeLog index be1c19090..d9d0690ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,11 @@ - (djm) [regress/modpipe.c regress/rekey.sh] Never intended to commit these - (djm) [configure.ac defines.h] Skip arc4random_stir() calls on platforms that lack it but have arc4random_uniform() + - (djm) OpenBSD CVS Sync + - markus@cvs.openbsd.org 2013/11/04 11:51:16 + [monitor.c] + fix rekeying for KEX_C25519_SHA256; noted by dtucker@ + RCSID sync only; I thought this was a merge botch and fixed it already 20131104 - (djm) OpenBSD CVS Sync diff --git a/monitor.c b/monitor.c index 328a605d9..03baf1ea9 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 * Copyright 2002 Markus Friedl -- cgit v1.2.3