tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-31 01:35:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream: debug("func: ...") -> debug_f("...")

Browse Source 
OpenBSD-Commit-ID: d58494dc05c985326a895adfbe16fbd5bcc54347
This commit is contained in:
djm@openbsd.org 2021-11-25 23:02:24 +00:00 committed by Damien Miller
parent b7ffbb17e3
commit 15db86611b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packet.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: packet.c,v 1.302 2021/11/13 21:14:13 deraadt Exp $ */ /* $OpenBSD: packet.c,v 1.303 2021/11/25 23:02:24 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
@ -871,7 +871,7 @@ ssh_set_newkeys(struct ssh *ssh, int mode)
int r, crypt_type; int r, crypt_type;
const char *dir = mode == MODE_OUT ? "out" : "in"; const char *dir = mode == MODE_OUT ? "out" : "in";
debug2("set_newkeys: mode %d", mode); debug2_f("mode %d", mode);
if (mode == MODE_OUT) { if (mode == MODE_OUT) {
ccp = &state->send_context; ccp = &state->send_context;
@ -908,7 +908,7 @@ ssh_set_newkeys(struct ssh *ssh, int mode)
return r; return r;
} }
mac->enabled = 1; mac->enabled = 1;
DBG(debug_f("cipher_init_context: %s", dir)); DBG(debug_f("cipher_init: %s", dir));
cipher_free(*ccp); cipher_free(*ccp);
*ccp = NULL; *ccp = NULL;
if ((r = cipher_init(ccp, enc->cipher, enc->key, enc->key_len, if ((r = cipher_init(ccp, enc->cipher, enc->key, enc->key_len,
@ -2083,16 +2083,16 @@ ssh_packet_set_maxsize(struct ssh *ssh, u_int s)
struct session_state *state = ssh->state; struct session_state *state = ssh->state;
if (state->set_maxsize_called) { if (state->set_maxsize_called) {
logit("packet_set_maxsize: called twice: old %d new %d", logit_f("called twice: old %d new %d",
state->max_packet_size, s); state->max_packet_size, s);
return -1; return -1;
} }
if (s < 4 * 1024 || s > 1024 * 1024) { if (s < 4 * 1024 || s > 1024 * 1024) {
logit("packet_set_maxsize: bad size %d", s); logit_f("bad size %d", s);
return -1; return -1;
} }
state->set_maxsize_called = 1; state->set_maxsize_called = 1;
debug("packet_set_maxsize: setting to %d", s); debug_f("setting to %d", s);
state->max_packet_size = s; state->max_packet_size = s;
return s; return s;
} }