summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--packet.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 45939e6d8..37e6532af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -115,6 +115,9 @@
115 - dtucker@cvs.openbsd.org 2006/08/05 08:28:24 115 - dtucker@cvs.openbsd.org 2006/08/05 08:28:24
116 [monitor_wrap.c auth-skey.c auth2-chall.c] 116 [monitor_wrap.c auth-skey.c auth2-chall.c]
117 Zap unused variables in -DSKEY code. ok djm@ 117 Zap unused variables in -DSKEY code. ok djm@
118 - dtucker@cvs.openbsd.org 2006/08/05 08:34:04
119 [packet.c]
120 Typo in comment
118 121
11920060804 12220060804
120 - (dtucker) [configure.ac] The "crippled AES" test does not work on recent 123 - (dtucker) [configure.ac] The "crippled AES" test does not work on recent
@@ -5185,4 +5188,4 @@
5185 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 5188 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
5186 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 5189 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
5187 5190
5188$Id: ChangeLog,v 1.4468 2006/08/05 08:50:35 dtucker Exp $ 5191$Id: ChangeLog,v 1.4469 2006/08/05 08:51:08 dtucker Exp $
diff --git a/packet.c b/packet.c
index f2e03f800..a4cb3324e 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: packet.c,v 1.142 2006/08/03 03:34:42 deraadt Exp $ */ 1/* $OpenBSD: packet.c,v 1.143 2006/08/05 08:34:04 dtucker Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -676,7 +676,7 @@ set_newkeys(int mode)
676 676
677/* 677/*
678 * Delayed compression for SSH2 is enabled after authentication: 678 * Delayed compression for SSH2 is enabled after authentication:
679 * This happans on the server side after a SSH2_MSG_USERAUTH_SUCCESS is sent, 679 * This happens on the server side after a SSH2_MSG_USERAUTH_SUCCESS is sent,
680 * and on the client side after a SSH2_MSG_USERAUTH_SUCCESS is received. 680 * and on the client side after a SSH2_MSG_USERAUTH_SUCCESS is received.
681 */ 681 */
682static void 682static void