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

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

diff --git a/ChangeLog b/ChangeLog
index 0dc6d7405b739929710c188f9a410ab77666661a..8d39e33f55021a666fefbf423fef7e9573659f59 100644 (file)
--- 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

diff --git a/mac.c b/mac.c
index 34464659ad66ca17aa7f70c7aa8e98f54f0475a2..fabc3ed661da8d532eaeaecbc57f4da67b8c06be 100644 (file)
--- 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: