2
0
mirror of git://sourceware.org/git/glibc.git synced 2025-03-19 13:40:59 +08:00
* crypt/md5-crypt.c (__md5_crypt_r): Compute used and required
	memory correctly.
This commit is contained in:
Ulrich Drepper 2001-08-31 01:46:47 +00:00
parent 90d40ab5d4
commit cb2391e14a
2 changed files with 7 additions and 4 deletions

@ -1,5 +1,8 @@
2001-08-30 Ulrich Drepper <drepper@redhat.com>
* crypt/md5-crypt.c (__md5_crypt_r): Compute used and required
memory correctly.
* sysdeps/unix/sysv/linux/ia64/ioperm.c (_ioperm): Use __open
instead of open, __close instead of close, __getpagesize instead
of getpagesize.

@ -1,5 +1,5 @@
/* One way encryption based on MD5 sum.
Copyright (C) 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
Copyright (C) 1996, 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@ -179,10 +179,10 @@ __md5_crypt_r (key, salt, buffer, buflen)
/* Now we can construct the result string. It consists of three
parts. */
cp = __stpncpy (buffer, md5_salt_prefix, MAX (0, buflen));
buflen -= sizeof (md5_salt_prefix);
buflen -= sizeof (md5_salt_prefix) - 1;
cp = __stpncpy (cp, salt, MIN ((size_t) buflen, salt_len));
buflen -= MIN ((size_t) buflen, salt_len);
cp = __stpncpy (cp, salt, MIN ((size_t) MAX (0, buflen), salt_len));
buflen -= MIN ((size_t) MAX (0, buflen), salt_len);
if (buflen > 0)
{