From 085124998d4662d40e9d45165831a4c5203b91cc Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Thu, 27 Jun 2002 00:23:02 +0000 Subject: [PATCH] - deraadt@cvs.openbsd.org 2002/06/26 15:00:32 [monitor_wrap.c] more %u --- ChangeLog | 5 ++++- monitor_wrap.c | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7fc90927a..61c9a1fb9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,9 @@ - markus@cvs.openbsd.org 2002/06/26 14:51:33 [ssh-add.c] fix exit code for -X/-x + - deraadt@cvs.openbsd.org 2002/06/26 15:00:32 + [monitor_wrap.c] + more %u 20020626 - (stevesk) [monitor.c] remove duplicate proto15 dispatch entry for PAM @@ -1181,4 +1184,4 @@ - (stevesk) entropy.c: typo in debug message - (djm) ssh-keygen -i needs seeded RNG; report from markus@ -$Id: ChangeLog,v 1.2305 2002/06/27 00:21:59 mouring Exp $ +$Id: ChangeLog,v 1.2306 2002/06/27 00:23:02 mouring Exp $ diff --git a/monitor_wrap.c b/monitor_wrap.c index f7e332d8e..938a67d90 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c @@ -25,7 +25,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: monitor_wrap.c,v 1.11 2002/06/19 18:01:00 markus Exp $"); +RCSID("$OpenBSD: monitor_wrap.c,v 1.12 2002/06/26 15:00:32 deraadt Exp $"); #include #include @@ -411,7 +411,7 @@ mm_newkeys_from_blob(u_char *blob, int blen) enc->key = buffer_get_string(&b, &enc->key_len); enc->iv = buffer_get_string(&b, &len); if (len != enc->block_size) - fatal("%s: bad ivlen: expected %d != %d", __func__, + fatal("%s: bad ivlen: expected %u != %u", __func__, enc->block_size, len); if (enc->name == NULL || cipher_by_name(enc->name) != enc->cipher) @@ -425,7 +425,7 @@ mm_newkeys_from_blob(u_char *blob, int blen) mac->enabled = buffer_get_int(&b); mac->key = buffer_get_string(&b, &len); if (len > mac->key_len) - fatal("%s: bad mac key length: %d > %d", __func__, len, + fatal("%s: bad mac key length: %u > %d", __func__, len, mac->key_len); mac->key_len = len; @@ -436,7 +436,7 @@ mm_newkeys_from_blob(u_char *blob, int blen) len = buffer_len(&b); if (len != 0) - error("newkeys_from_blob: remaining bytes in blob %d", len); + error("newkeys_from_blob: remaining bytes in blob %u", len); buffer_free(&b); return (newkey); }