diff options
author | Damien Miller <djm@mindrot.org> | 2013-11-07 13:32:51 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2013-11-07 13:32:51 +1100 |
commit | 67a8800f290b39fd60e379988c700656ae3f2539 (patch) | |
tree | 81a19b78f98e5ed0ef1f302df2d6325803b2441d | |
parent | df8b030b15fcec7baf38ec7944f309f9ca8cc9a7 (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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | monitor.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -5,6 +5,11 @@ | |||
5 | - (djm) [regress/modpipe.c regress/rekey.sh] Never intended to commit these | 5 | - (djm) [regress/modpipe.c regress/rekey.sh] Never intended to commit these |
6 | - (djm) [configure.ac defines.h] Skip arc4random_stir() calls on platforms | 6 | - (djm) [configure.ac defines.h] Skip arc4random_stir() calls on platforms |
7 | that lack it but have arc4random_uniform() | 7 | that lack it but have arc4random_uniform() |
8 | - (djm) OpenBSD CVS Sync | ||
9 | - markus@cvs.openbsd.org 2013/11/04 11:51:16 | ||
10 | [monitor.c] | ||
11 | fix rekeying for KEX_C25519_SHA256; noted by dtucker@ | ||
12 | RCSID sync only; I thought this was a merge botch and fixed it already | ||
8 | 13 | ||
9 | 20131104 | 14 | 20131104 |
10 | - (djm) OpenBSD CVS Sync | 15 | - (djm) OpenBSD CVS Sync |
@@ -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> |