summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-11-20 15:14:29 +1100
committerDamien Miller <djm@mindrot.org>2010-11-20 15:14:29 +1100
commit7a221a159188eceeea366d4f58345d2bdccaeb8d (patch)
tree1e4e20c7baa24c32c98bc707a61b5ff6d22cd8d9
parentdd190ddfd7a8934808556354eeee6ee690443d3e (diff)
- djm@cvs.openbsd.org 2010/11/05 02:46:47
[packet.c] whitespace KNF
-rw-r--r--ChangeLog6
-rw-r--r--packet.c21
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 @@
120101120
2 - OpenBSD CVS Sync
3 - djm@cvs.openbsd.org 2010/11/05 02:46:47
4 [packet.c]
5 whitespace KNF
6
120101111 720101111
2 - (djm) [servconf.c ssh-add.c ssh-keygen.c] don't look for ECDSA keys on 8 - (djm) [servconf.c ssh-add.c ssh-keygen.c] don't look for ECDSA keys on
3 platforms that don't support ECC. Fixes some spurious warnings reported 9 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 @@
1/* $OpenBSD: packet.c,v 1.170 2010/08/31 11:54:45 djm Exp $ */ 1/* $OpenBSD: packet.c,v 1.171 2010/11/05 02:46:47 djm 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
@@ -199,13 +199,13 @@ static struct session_state *active_state, *backup_state;
199static struct session_state * 199static struct session_state *
200alloc_session_state(void) 200alloc_session_state(void)
201{ 201{
202 struct session_state *s = xcalloc(1, sizeof(*s)); 202 struct session_state *s = xcalloc(1, sizeof(*s));
203 203
204 s->connection_in = -1; 204 s->connection_in = -1;
205 s->connection_out = -1; 205 s->connection_out = -1;
206 s->max_packet_size = 32768; 206 s->max_packet_size = 32768;
207 s->packet_timeout_ms = -1; 207 s->packet_timeout_ms = -1;
208 return s; 208 return s;
209} 209}
210 210
211/* 211/*
@@ -391,8 +391,8 @@ packet_get_ssh1_cipher(void)
391} 391}
392 392
393void 393void
394packet_get_state(int mode, u_int32_t *seqnr, u_int64_t *blocks, u_int32_t *packets, 394packet_get_state(int mode, u_int32_t *seqnr, u_int64_t *blocks,
395 u_int64_t *bytes) 395 u_int32_t *packets, u_int64_t *bytes)
396{ 396{
397 struct packet_state *state; 397 struct packet_state *state;
398 398
@@ -547,8 +547,7 @@ packet_start_compression(int level)
547 */ 547 */
548 548
549void 549void
550packet_set_encryption_key(const u_char *key, u_int keylen, 550packet_set_encryption_key(const u_char *key, u_int keylen, int number)
551 int number)
552{ 551{
553 Cipher *cipher = cipher_by_number(number); 552 Cipher *cipher = cipher_by_number(number);
554 553