From c91e556d8a2cf97a5d7075154d39eb8fd4098fe4 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sun, 26 Mar 2006 13:58:55 +1100 Subject: [PATCH] - deraadt@cvs.openbsd.org 2006/03/19 18:53:12 [kex.c kex.h monitor.c myproposal.h session.c] spacing --- ChangeLog | 5 ++++- kex.c | 2 +- monitor.c | 2 +- session.c | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8bd37a01e..8c7627074 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,9 @@ - deraadt@cvs.openbsd.org 2006/03/19 18:52:11 [auth1.c authfd.c channels.c] spacing + - deraadt@cvs.openbsd.org 2006/03/19 18:53:12 + [kex.c kex.h monitor.c myproposal.h session.c] + spacing 20060325 - OpenBSD CVS Sync @@ -4297,4 +4300,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.4252 2006/03/26 02:57:41 djm Exp $ +$Id: ChangeLog,v 1.4253 2006/03/26 02:58:55 djm Exp $ diff --git a/kex.c b/kex.c index ced56e668..930e9cb4d 100644 --- a/kex.c +++ b/kex.c @@ -432,7 +432,7 @@ derive_key(Kex *kex, int id, u_int need, u_char *hash, u_int hashlen, if ((mdsz = EVP_MD_size(kex->evp_md)) <= 0) fatal("bad kex md size %d", mdsz); - digest = xmalloc(roundup(need, mdsz)); + digest = xmalloc(roundup(need, mdsz)); buffer_init(&b); buffer_put_bignum2(&b, shared_secret); diff --git a/monitor.c b/monitor.c index e34d006d7..8b304f99c 100644 --- a/monitor.c +++ b/monitor.c @@ -545,7 +545,7 @@ mm_answer_sign(int sock, Buffer *m) p = buffer_get_string(m, &datlen); /* - * Supported KEX types will only return SHA1 (20 byte) or + * Supported KEX types will only return SHA1 (20 byte) or * SHA256 (32 byte) hashes */ if (datlen != 20 && datlen != 32) diff --git a/session.c b/session.c index 6efaf659d..b71a2c71a 100644 --- a/session.c +++ b/session.c @@ -2190,7 +2190,7 @@ session_exit_message(Session *s, int status) /* * Adjust cleanup callback attachment to send close messages when - * the channel gets EOF. The session will be then be closed + * the channel gets EOF. The session will be then be closed * by session_close_by_channel when the childs close their fds. */ channel_register_cleanup(c->self, session_close_by_channel, 1);