tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2010/11/05 02:46:47 

[packet.c]
     whitespace KNF
This commit is contained in:
Damien Miller 2010-11-20 15:14:29 +11:00
parent dd190ddfd7
commit 7a221a1591
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
20101120
- OpenBSD CVS Sync
- djm@cvs.openbsd.org 2010/11/05 02:46:47
[packet.c]
whitespace KNF
20101111 20101111
- (djm) [servconf.c ssh-add.c ssh-keygen.c] don't look for ECDSA keys on - (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 platforms that don't support ECC. Fixes some spurious warnings reported

21
packet.c
View File

@ -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 <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -199,13 +199,13 @@ static struct session_state *active_state, *backup_state;
static struct session_state * static struct session_state *
alloc_session_state(void) 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_in = -1;
s->connection_out = -1; s->connection_out = -1;
s->max_packet_size = 32768; s->max_packet_size = 32768;
s->packet_timeout_ms = -1; s->packet_timeout_ms = -1;
return s; return s;
} }
/* /*
@ -391,8 +391,8 @@ packet_get_ssh1_cipher(void)
} }
void void
packet_get_state(int mode, u_int32_t *seqnr, u_int64_t *blocks, u_int32_t *packets, packet_get_state(int mode, u_int32_t *seqnr, u_int64_t *blocks,
u_int64_t *bytes) u_int32_t *packets, u_int64_t *bytes)
{ {
struct packet_state *state; struct packet_state *state;
@ -547,8 +547,7 @@ packet_start_compression(int level)
*/ */
void void
packet_set_encryption_key(const u_char *key, u_int keylen, packet_set_encryption_key(const u_char *key, u_int keylen, int number)
int number)
{ {
Cipher *cipher = cipher_by_number(number); Cipher *cipher = cipher_by_number(number);