summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2016-02-04 23:43:49 +0000
committerDamien Miller <djm@cvs.openbsd.org>2016-02-04 23:43:49 +0000
commit492d208da8a1f551022620c97959b7002dc93593 (patch)
tree15c34ef17c53e6be165d0f3133dac64974593ec2
parentdd800384f134a7451415a899693c38adc477f91a (diff)
printf argument casts to avoid warnings on strict compilers
-rw-r--r--usr.bin/ssh/packet.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/usr.bin/ssh/packet.c b/usr.bin/ssh/packet.c
index a3b3aae0be7..427e82ed354 100644
--- a/usr.bin/ssh/packet.c
+++ b/usr.bin/ssh/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.226 2016/01/29 05:46:01 djm Exp $ */
+/* $OpenBSD: packet.c,v 1.227 2016/02/04 23:43:48 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -943,8 +943,10 @@ ssh_set_newkeys(struct ssh *ssh, int mode)
if (state->newkeys[mode] != NULL) {
debug("set_newkeys: rekeying, input %llu bytes %llu blocks, "
"output %llu bytes %llu blocks",
- state->p_read.bytes, state->p_read.blocks,
- state->p_send.bytes, state->p_send.blocks);
+ (unsigned long long)state->p_read.bytes,
+ (unsigned long long)state->p_read.blocks,
+ (unsigned long long)state->p_send.bytes,
+ (unsigned long long)state->p_send.blocks);
if ((r = cipher_cleanup(cc)) != 0)
return r;
enc = &state->newkeys[mode]->enc;
@@ -1012,7 +1014,7 @@ ssh_set_newkeys(struct ssh *ssh, int mode)
if (state->rekey_limit)
*max_blocks = MIN(*max_blocks,
state->rekey_limit / enc->block_size);
- debug("rekey after %llu blocks", *max_blocks);
+ debug("rekey after %llu blocks", (unsigned long long)*max_blocks);
return 0;
}