- 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

2 files changed, 6 insertions, 1 deletions

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 <provos@citi.umich.edu>
  * Copyright 2002 Markus Friedl <markus@openbsd.org>