1
0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00

Suppress signed-vs-unsigned-char warnings in contrib.

This commit is contained in:
Tom Lane
2005-09-24 19:14:05 +00:00
parent 8889685555
commit 8a65b820e2
15 changed files with 124 additions and 105 deletions

View File

@ -8,7 +8,7 @@
*
* $FreeBSD: src/lib/libcrypt/crypt-md5.c,v 1.5 1999/12/17 20:21:45 peter Exp $
*
* $PostgreSQL: pgsql/contrib/pgcrypto/crypt-md5.c,v 1.4 2005/07/11 15:07:59 tgl Exp $
* $PostgreSQL: pgsql/contrib/pgcrypto/crypt-md5.c,v 1.5 2005/09/24 19:14:04 tgl Exp $
*/
#include "postgres.h"
@ -63,18 +63,18 @@ px_crypt_md5(const char *pw, const char *salt, char *passwd, unsigned dstlen)
err = px_find_digest("md5", &ctx1);
/* The password first, since that is what is most unknown */
px_md_update(ctx, pw, strlen(pw));
px_md_update(ctx, (uint8 *) pw, strlen(pw));
/* Then our magic string */
px_md_update(ctx, magic, strlen(magic));
px_md_update(ctx, (uint8 *) magic, strlen(magic));
/* Then the raw salt */
px_md_update(ctx, sp, sl);
px_md_update(ctx, (uint8 *) sp, sl);
/* Then just as many characters of the MD5(pw,salt,pw) */
px_md_update(ctx1, pw, strlen(pw));
px_md_update(ctx1, sp, sl);
px_md_update(ctx1, pw, strlen(pw));
px_md_update(ctx1, (uint8 *) pw, strlen(pw));
px_md_update(ctx1, (uint8 *) sp, sl);
px_md_update(ctx1, (uint8 *) pw, strlen(pw));
px_md_finish(ctx1, final);
for (pl = strlen(pw); pl > 0; pl -= MD5_SIZE)
px_md_update(ctx, final, pl > MD5_SIZE ? MD5_SIZE : pl);
@ -87,7 +87,7 @@ px_crypt_md5(const char *pw, const char *salt, char *passwd, unsigned dstlen)
if (i & 1)
px_md_update(ctx, final, 1);
else
px_md_update(ctx, pw, 1);
px_md_update(ctx, (uint8 *) pw, 1);
/* Now make the output string */
strcpy(passwd, magic);
@ -105,20 +105,20 @@ px_crypt_md5(const char *pw, const char *salt, char *passwd, unsigned dstlen)
{
px_md_reset(ctx1);
if (i & 1)
px_md_update(ctx1, pw, strlen(pw));
px_md_update(ctx1, (uint8 *) pw, strlen(pw));
else
px_md_update(ctx1, final, MD5_SIZE);
if (i % 3)
px_md_update(ctx1, sp, sl);
px_md_update(ctx1, (uint8 *) sp, sl);
if (i % 7)
px_md_update(ctx1, pw, strlen(pw));
px_md_update(ctx1, (uint8 *) pw, strlen(pw));
if (i & 1)
px_md_update(ctx1, final, MD5_SIZE);
else
px_md_update(ctx1, pw, strlen(pw));
px_md_update(ctx1, (uint8 *) pw, strlen(pw));
px_md_finish(ctx1, final);
}