From b35314a679c87b030642d4834d3d3db26f7e5683 Mon Sep 17 00:00:00 2001 From: joe Date: Sun, 29 Apr 2007 08:24:32 +0000 Subject: Merge r1158 from trunk: * test/util-tests.c (digest_md5, md5): Meet alignment requirement of MD5 API. git-svn-id: http://svn.webdav.org/repos/projects/neon/branches/0.26.x@1168 61a7d7f5-40b7-0310-9c16-bb0ea8cb1845 --- test/util-tests.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/util-tests.c b/test/util-tests.c index 2583196..95e4c74 100644 --- a/test/util-tests.c +++ b/test/util-tests.c @@ -101,7 +101,8 @@ static int status_lines(void) } /* Write MD5 of 'len' bytes of 'str' to 'digest' */ -static unsigned char *digest_md5(const char *data, size_t len, unsigned char digest[16]) +static unsigned char *digest_md5(const char *data, size_t len, + unsigned int digest[4]) { struct ne_md5_ctx *ctx; @@ -117,12 +118,12 @@ static unsigned char *digest_md5(const char *data, size_t len, unsigned char dig ne_md5_finish_ctx(ctx, digest); ne_md5_destroy_ctx(ctx); - return digest; + return (unsigned char *)digest; } static int md5(void) { - unsigned char buf[17] = {0}, buf2[17] = {0}; + unsigned int buf[4], buf2[4] = {0}; char ascii[33] = {0}; char zzzs[500]; @@ -138,7 +139,7 @@ static int md5(void) ne_md5_to_ascii(digest_md5(zzzs, sizeof zzzs, buf), ascii); ONN("MD5(\"z\"x512)", strcmp(ascii, "8b9323bd72250ea7f1b2b3fb5046391a")); - ne_ascii_to_md5(ascii, buf2); + ne_ascii_to_md5(ascii, (unsigned char *)buf2); ON(memcmp(buf, buf2, 16)); return OK; -- cgit v1.2.1