summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2012-10-05 10:51:59 +1000
committerDarren Tucker <dtucker@zip.com.au>2012-10-05 10:51:59 +1000
commit3a7c04105a545188b84bd3b4db682d8d64a7ea8f (patch)
treeaed006ba4e0cc666ecb6cec43f839750531cee20
parent628a3fdce25afcff19aaa981040198ccfa49e109 (diff)
downloadopenssh-git-3a7c04105a545188b84bd3b4db682d8d64a7ea8f.tar.gz
- naddy@cvs.openbsd.org 2012/10/01 13:59:51
[monitor_wrap.c] pasto; ok djm@
-rw-r--r--ChangeLog3
-rw-r--r--monitor_wrap.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c22e569c..544f8d2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,9 @@
[ssh.1]
last stage of rfc changes, using consistent Rs/Re blocks, and moving the
references into a STANDARDS section;
+ - naddy@cvs.openbsd.org 2012/10/01 13:59:51
+ [monitor_wrap.c]
+ pasto; ok djm@
20120917
- (dtucker) OpenBSD CVS Sync
diff --git a/monitor_wrap.c b/monitor_wrap.c
index 1f60658e..c22d0a2a 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor_wrap.c,v 1.73 2011/06/17 21:44:31 djm Exp $ */
+/* $OpenBSD: monitor_wrap.c,v 1.74 2012/10/01 13:59:51 naddy Exp $ */
/*
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
* Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -621,7 +621,7 @@ mm_send_keystate(struct monitor *monitor)
ivlen = packet_get_keyiv_len(MODE_OUT);
packet_get_keyiv(MODE_OUT, iv, ivlen);
buffer_put_string(&m, iv, ivlen);
- ivlen = packet_get_keyiv_len(MODE_OUT);
+ ivlen = packet_get_keyiv_len(MODE_IN);
packet_get_keyiv(MODE_IN, iv, ivlen);
buffer_put_string(&m, iv, ivlen);
goto skip;