* nis/ypupdate_xdr.c: Add libnsl_hidden_def for xdr_ypdelete_args.

[platform/upstream/glibc.git] / crypt / md5-crypt.c

diff --git a/crypt/md5-crypt.c b/crypt/md5-crypt.c
index 2ca1021..7ba1491 100644 (file)
--- a/crypt/md5-crypt.c
+++ b/crypt/md5-crypt.c
@@ -1,22 +1,24 @@
 /* One way encryption based on MD5 sum.
-   Copyright (C) 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
+   Compatible with the behavior of MD5 crypt introduced in FreeBSD 2.0.
+   Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2004
+   Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
    The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    The GNU C Library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
 
 #include <assert.h>
 #include <errno.h>
@@ -179,10 +181,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)
     {
@@ -233,8 +235,10 @@ __md5_crypt_r (key, salt, buffer, buflen)
   return buffer;
 }
 
-
-static char *buffer;
+#ifndef _LIBC
+# define libc_freeres_ptr(decl) decl
+#endif
+libc_freeres_ptr (static char *buffer);
 
 char *
 __md5_crypt (const char *key, const char *salt)
@@ -247,18 +251,22 @@ __md5_crypt (const char *key, const char *salt)
 
   if (buflen < needed)
     {
-      buflen = needed;
-      if ((buffer = realloc (buffer, buflen)) == NULL)
+      char *new_buffer = (char *) realloc (buffer, needed);
+      if (new_buffer == NULL)
        return NULL;
+
+      buffer = new_buffer;
+      buflen = needed;
     }
 
   return __md5_crypt_r (key, salt, buffer, buflen);
 }
 
-
+#ifndef _LIBC
 static void
 __attribute__ ((__destructor__))
 free_mem (void)
 {
   free (buffer);
 }
+#endif