From 7a221a159188eceeea366d4f58345d2bdccaeb8d Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sat, 20 Nov 2010 15:14:29 +1100 Subject: - djm@cvs.openbsd.org 2010/11/05 02:46:47 [packet.c] whitespace KNF --- ChangeLog | 6 ++++++ packet.c | 21 ++++++++++----------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 601692cea..64c7d8abd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +20101120 + - OpenBSD CVS Sync + - djm@cvs.openbsd.org 2010/11/05 02:46:47 + [packet.c] + whitespace KNF + 20101111 - (djm) [servconf.c ssh-add.c ssh-keygen.c] don't look for ECDSA keys on platforms that don't support ECC. Fixes some spurious warnings reported diff --git a/packet.c b/packet.c index 0018d5839..698920013 100644 --- a/packet.c +++ b/packet.c @@ -1,4 +1,4 @@ -/* $OpenBSD: packet.c,v 1.170 2010/08/31 11:54:45 djm Exp $ */ +/* $OpenBSD: packet.c,v 1.171 2010/11/05 02:46:47 djm Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -199,13 +199,13 @@ static struct session_state *active_state, *backup_state; static struct session_state * alloc_session_state(void) { - struct session_state *s = xcalloc(1, sizeof(*s)); + struct session_state *s = xcalloc(1, sizeof(*s)); - s->connection_in = -1; - s->connection_out = -1; - s->max_packet_size = 32768; - s->packet_timeout_ms = -1; - return s; + s->connection_in = -1; + s->connection_out = -1; + s->max_packet_size = 32768; + s->packet_timeout_ms = -1; + return s; } /* @@ -391,8 +391,8 @@ packet_get_ssh1_cipher(void) } void -packet_get_state(int mode, u_int32_t *seqnr, u_int64_t *blocks, u_int32_t *packets, - u_int64_t *bytes) +packet_get_state(int mode, u_int32_t *seqnr, u_int64_t *blocks, + u_int32_t *packets, u_int64_t *bytes) { struct packet_state *state; @@ -547,8 +547,7 @@ packet_start_compression(int level) */ void -packet_set_encryption_key(const u_char *key, u_int keylen, - int number) +packet_set_encryption_key(const u_char *key, u_int keylen, int number) { Cipher *cipher = cipher_by_number(number); -- cgit v1.2.3