diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | mac.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -151,6 +151,9 @@ | |||
151 | - dtucker@cvs.openbsd.org 2008/06/13 00:47:53 | 151 | - dtucker@cvs.openbsd.org 2008/06/13 00:47:53 |
152 | [mux.c] | 152 | [mux.c] |
153 | upcast size_t to u_long to match format arg; ok djm@ | 153 | upcast size_t to u_long to match format arg; ok djm@ |
154 | - dtucker@cvs.openbsd.org 2008/06/13 00:51:47 | ||
155 | [mac.c] | ||
156 | upcast another size_t to u_long to match format | ||
154 | - (dtucker) [clientloop.c serverloop.c] channel_register_filter now | 157 | - (dtucker) [clientloop.c serverloop.c] channel_register_filter now |
155 | takes 2 more args. with djm@ | 158 | takes 2 more args. with djm@ |
156 | - (dtucker) [defines.h] Bug #1112: __dead is, well dead. Based on a patch | 159 | - (dtucker) [defines.h] Bug #1112: __dead is, well dead. Based on a patch |
@@ -4317,4 +4320,4 @@ | |||
4317 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 4320 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
4318 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 4321 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
4319 | 4322 | ||
4320 | $Id: ChangeLog,v 1.4997 2008/06/13 00:58:10 dtucker Exp $ | 4323 | $Id: ChangeLog,v 1.4998 2008/06/13 00:58:50 dtucker Exp $ |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: mac.c,v 1.14 2007/06/07 19:37:34 pvalchev Exp $ */ | 1 | /* $OpenBSD: mac.c,v 1.15 2008/06/13 00:51:47 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -128,7 +128,7 @@ mac_compute(Mac *mac, u_int32_t seqno, u_char *data, int datalen) | |||
128 | 128 | ||
129 | if (mac->mac_len > sizeof(m)) | 129 | if (mac->mac_len > sizeof(m)) |
130 | fatal("mac_compute: mac too long %u %lu", | 130 | fatal("mac_compute: mac too long %u %lu", |
131 | mac->mac_len, sizeof(m)); | 131 | mac->mac_len, (u_long)sizeof(m)); |
132 | 132 | ||
133 | switch (mac->type) { | 133 | switch (mac->type) { |
134 | case SSH_EVP: | 134 | case SSH_EVP: |