diff options
| author |   djm <djm@openbsd.org> | 2019-03-01 03:29:32 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2019-03-01 03:29:32 +0000 |
| commit | 084613e3c089b8c474ef034a3e8d20b8fda01a53 (patch) | |
| tree | 597383e5b23bc52278adfcadb7efad19016bc187 | |
| parent | Fix two race conditions in sshd relating to SIGHUP: (diff) | |
| download | wireguard-openbsd-084613e3c089b8c474ef034a3e8d20b8fda01a53.tar.xz wireguard-openbsd-084613e3c089b8c474ef034a3e8d20b8fda01a53.zip | |
in ssh_set_newkeys(), mention the direction that we're keying in debug
messages. Previously it would be difficult to tell which direction
it was talking about
| -rw-r--r-- | usr.bin/ssh/packet.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/usr.bin/ssh/packet.c b/usr.bin/ssh/packet.c index e6ee7c1bd98..b5f0c12f1ce 100644 --- a/usr.bin/ssh/packet.c +++ b/usr.bin/ssh/packet.c @@ -1,4 +1,4 @@ -/* $OpenBSD: packet.c,v 1.282 2019/01/21 10:35:09 djm Exp $ */ +/* $OpenBSD: packet.c,v 1.283 2019/03/01 03:29:32 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -818,6 +818,7 @@ ssh_set_newkeys(struct ssh *ssh, int mode) u_int64_t *max_blocks; const char *wmsg; int r, crypt_type; + const char *dir = mode == MODE_OUT ? "out" : "in"; debug2("set_newkeys: mode %d", mode); @@ -833,8 +834,8 @@ ssh_set_newkeys(struct ssh *ssh, int mode) max_blocks = &state->max_blocks_in; } if (state->newkeys[mode] != NULL) { - debug("set_newkeys: rekeying, input %llu bytes %llu blocks, " - "output %llu bytes %llu blocks", + debug("%s: rekeying %s, input %llu bytes %llu blocks, " + "output %llu bytes %llu blocks", __func__, dir, (unsigned long long)state->p_read.bytes, (unsigned long long)state->p_read.blocks, (unsigned long long)state->p_send.bytes, @@ -856,7 +857,7 @@ ssh_set_newkeys(struct ssh *ssh, int mode) return r; } mac->enabled = 1; - DBG(debug("cipher_init_context: %d", mode)); + DBG(debug("%s: cipher_init_context: %s", __func__, dir)); cipher_free(*ccp); *ccp = NULL; if ((r = cipher_init(ccp, enc->cipher, enc->key, enc->key_len, @@ -897,7 +898,8 @@ ssh_set_newkeys(struct ssh *ssh, int mode) if (state->rekey_limit) *max_blocks = MINIMUM(*max_blocks, state->rekey_limit / enc->block_size); - debug("rekey after %llu blocks", (unsigned long long)*max_blocks); + debug("rekey %s after %llu blocks", dir, + (unsigned long long)*max_blocks); return 0; } |