Module Name: src Committed By: matt Date: Sat Feb 12 22:24:01 UTC 2011
Modified Files: src/crypto/external/bsd/libsaslc/dist/src: mech_digestmd5.c Log Message: Fix some LP64/IPL32 issues To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/libsaslc/dist/src/mech_digestmd5.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/crypto/external/bsd/libsaslc/dist/src/mech_digestmd5.c diff -u src/crypto/external/bsd/libsaslc/dist/src/mech_digestmd5.c:1.4 src/crypto/external/bsd/libsaslc/dist/src/mech_digestmd5.c:1.5 --- src/crypto/external/bsd/libsaslc/dist/src/mech_digestmd5.c:1.4 Fri Feb 11 23:44:43 2011 +++ src/crypto/external/bsd/libsaslc/dist/src/mech_digestmd5.c Sat Feb 12 22:24:01 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mech_digestmd5.c,v 1.4 2011/02/11 23:44:43 christos Exp $ */ +/* $NetBSD: mech_digestmd5.c,v 1.5 2011/02/12 22:24:01 matt Exp $ */ /* Copyright (c) 2010 The NetBSD Foundation, Inc. * All rights reserved. @@ -35,7 +35,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__RCSID("$NetBSD: mech_digestmd5.c,v 1.4 2011/02/11 23:44:43 christos Exp $"); +__RCSID("$NetBSD: mech_digestmd5.c,v 1.5 2011/02/12 22:24:01 matt Exp $"); #include <assert.h> #include <md5.h> @@ -180,7 +180,7 @@ char *realm; cipher_t cipher; int nonce_cnt; - unsigned long maxbuf; + size_t maxbuf; } rdata_t; typedef uint8_t md5hash_t[MD5_DIGEST_LENGTH]; @@ -1240,8 +1240,8 @@ "cipher error"); return -1; } - assert(tmplen == len - 6); - if (tmplen != len - 6) + assert(tmplen == (ssize_t)len - 6); + if (tmplen != (ssize_t)len - 6) return -1; } @@ -2115,7 +2115,7 @@ } /*FALLTHROUGH*/ case QOP_INT: - if (asprintf(&maxbuf, "maxbuf=%zd,", ms->rdata.maxbuf) == -1) { + if (asprintf(&maxbuf, "maxbuf=%zu,", ms->rdata.maxbuf) == -1) { saslc__error_set_errno(ERR(sess), ERROR_NOMEM); goto done; }