diff options
author | dtucker <dtucker> | 2008-06-13 00:58:50 +0000 |
---|---|---|
committer | dtucker <dtucker> | 2008-06-13 00:58:50 +0000 |
commit | 8c86af6d3783f495af4f2cbaa67862ece5599f65 (patch) | |
tree | 7b4c6cdd864a11434616d9d30ddf149f745eb061 | |
parent | 8a00e6da2c687b80b3992c91a8061332708d80fa (diff) | |
download | openssh-8c86af6d3783f495af4f2cbaa67862ece5599f65.tar.gz |
- 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: |