- dtucker@cvs.openbsd.org 2008/06/13 00:51:47

     [mac.c]
     upcast another size_t to u_long to match format

2 files changed, 6 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 4e39326b0..584f8b6b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -151,6 +151,9 @@
    - dtucker@cvs.openbsd.org 2008/06/13 00:47:53
      [mux.c]
      upcast size_t to u_long to match format arg; ok djm@
+   - dtucker@cvs.openbsd.org 2008/06/13 00:51:47
+     [mac.c]
+     upcast another size_t to u_long to match format
   - (dtucker) [clientloop.c serverloop.c]  channel_register_filter now
     takes 2 more args.  with djm@
   - (dtucker) [defines.h] Bug #1112: __dead is, well dead. Based on a patch
@@ -4317,4 +4320,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4997 2008/06/13 00:58:10 dtucker Exp $
+$Id: ChangeLog,v 1.4998 2008/06/13 00:58:50 dtucker Exp $
diff --git a/mac.c b/mac.c
index 34464659a..fabc3ed66 100644
--- a/mac.c
+++ b/mac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mac.c,v 1.14 2007/06/07 19:37:34 pvalchev Exp $ */
+/* $OpenBSD: mac.c,v 1.15 2008/06/13 00:51:47 dtucker Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  *
@@ -128,7 +128,7 @@ mac_compute(Mac *mac, u_int32_t seqno, u_char *data, int datalen)
 
         if (mac->mac_len > sizeof(m))
                 fatal("mac_compute: mac too long %u %lu",
-                    mac->mac_len, sizeof(m));
+                    mac->mac_len, (u_long)sizeof(m));
 
         switch (mac->type) {
         case SSH_EVP: