diff options
author | Darren Tucker <dtucker@zip.com.au> | 2008-06-13 10:58:50 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2008-06-13 10:58:50 +1000 |
commit | c7e030fd78594100cce362db230ee75ddb38a852 (patch) | |
tree | fbc7e7b34d8b4dda6dd8ec968b6d0a2eb7d00c5c | |
parent | 1adfd368c48f8b9b70a33a7094cff8930bfdf72e (diff) |
- dtucker@cvs.openbsd.org 2008/06/13 00:51:47
[mac.c]
upcast another size_t to u_long to match format
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | mac.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -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 $ @@ -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: |