summaryrefslogtreecommitdiff
path: root/monitor.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-11-07 13:32:51 +1100
committerDamien Miller <djm@mindrot.org>2013-11-07 13:32:51 +1100
commit67a8800f290b39fd60e379988c700656ae3f2539 (patch)
tree81a19b78f98e5ed0ef1f302df2d6325803b2441d /monitor.c
parentdf8b030b15fcec7baf38ec7944f309f9ca8cc9a7 (diff)
- 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
Diffstat (limited to 'monitor.c')
-rw-r--r--monitor.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/monitor.c b/monitor.c
index 328a605d9..03baf1ea9 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor.c,v 1.127 2013/07/19 07:37:48 markus Exp $ */ 1/* $OpenBSD: monitor.c,v 1.128 2013/11/04 11:51:16 markus Exp $ */
2/* 2/*
3 * Copyright 2002 Niels Provos <provos@citi.umich.edu> 3 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
4 * Copyright 2002 Markus Friedl <markus@openbsd.org> 4 * Copyright 2002 Markus Friedl <markus@openbsd.org>