about summary refs log tree commit diff
path: root/md5-crypt/md5-crypt.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1997-06-03 21:53:09 +0000
committerUlrich Drepper <drepper@redhat.com>1997-06-03 21:53:09 +0000
commitb13927da591adbbae887fc89cc66c8ca7ab5b13b (patch)
tree5462fdfeeca042253cf3bb208ffd7db1acff7425 /md5-crypt/md5-crypt.c
parentf671aeab4e17d6dc1c3ca96ac5cb2c3e04570082 (diff)
downloadglibc-b13927da591adbbae887fc89cc66c8ca7ab5b13b.tar.gz
glibc-b13927da591adbbae887fc89cc66c8ca7ab5b13b.tar.xz
glibc-b13927da591adbbae887fc89cc66c8ca7ab5b13b.zip
Update.
1997-06-03 23:42  Ulrich Drepper  <drepper@cygnus.com>

	* elf/dl-support.c: Define and initialize _dl_verbose used in
	dl-machine.h.

	* io/ftw.c: Expand stat/lstat calls.

	* manual/intro.texi: Also refer to ISO 9945.
	Update info about SVID.
	Add description for XPG.

	* md5-crypt/md5-crypt.c: Namespace cleanups.
	* md5-crypt/md5.c: Likewise.
	* md5-crypt/md5.h: Likewise.
	* sysdeps/generic/crypt-entry.c: Likewise.

	* posix/unistd.h (_POSIX2_C_VERSION): Set to 199209L.

	* stdlib/fmtmsg.h: Declare addseverity only if __USE_SVID is
	defined.

	* sunrpc/rpc_scan.c (findkind): Declare `token' as const.
	* sunrpc/rpc_util.c (toktostr): Declare `token' as const.

	* time/Makefile: Make tzselect dependen of config.make.

1997-06-01 15:01  Miles Bader  <miles@gnu.ai.mit.edu>

	* manual/string.texi (String and Array Utilities): Add `Argz and
	Envz Vectors' to the menu.
	(Argz and Envz Vectors, Argz Functions, Envz Functions): New nodes.

1997-05-31 20:59  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* login/Makefile (utmpd-routines): Add utmpd.
	(extra-objs): Add utmpd objects to get dependencies.
	(distribute): Add sources for utmpd.
	(subdir-dirs): Define.

1997-06-02 16:28  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/wordsize-32/inttypes.h: Include features.h and use
	__CONCAT instead of defined __CONCAT__ ourself.
	* sysdeps/wordsize-64/inttypes.h: Likewise.

1997-06-01 19:11  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/wordsize-64/inttypes.h (INTMAX_C): Use `l' suffix, not
	`ll'.
	(PRIdFAST, PRIoFAST, PRIxFAST, PRIuFAST, SCNdFAST, SCNiFAST,
	SCNoFAST, SCNxFAST): Correct format specifiers.

1997-06-02 04:23  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/syscalls.list: Make fchdir weak alias for __fchdir.

1997-06-01 19:17  Ulrich Drepper  <drepper@cygnus.com>

	* md5-crypt/Makefile: Correct libmd5crypt file to really generate
	DES free libcrypt.
	* md5-crypt/onlymd5-entry.c: New file.  Wrapper around
	sysdeps/generic/crypt-entry.c.

1997-06-01 12:48  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/sysv/linux/alpha/gnu/types.h (__fd_mask): Change
	type to `unsigned long int'.
	Patch by Richard Henderson <richard@twiddle.rth.home>.

1997-05-30 17:34  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* sysdeps/generic/bb_init_func.c (__bb_init_func): Use ISO C
	declaration style.

	* nss/nss_files/files-hosts.c: Delete inclusion of
	"../resolv/mapv4v6hostent.h".
Diffstat (limited to 'md5-crypt/md5-crypt.c')
-rw-r--r--md5-crypt/md5-crypt.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/md5-crypt/md5-crypt.c b/md5-crypt/md5-crypt.c
index 2b4965ba58..dd9d413c42 100644
--- a/md5-crypt/md5-crypt.c
+++ b/md5-crypt/md5-crypt.c
@@ -37,8 +37,10 @@ static const char b64t[64] =
 
 
 /* Prototypes for local functions.  */
-extern char *md5_crypt_r __P ((const char *key, const char *salt, char *buffer,
-			       int buflen));
+extern char *__md5_crypt_r __P ((const char *key, const char *salt,
+				 char *buffer, int buflen));
+extern char *md5_crypt_r __P ((const char *key, const char *salt,
+			       char *buffer, int buflen));
 extern char *md5_crypt __P ((const char *key, const char *salt));
 
 
@@ -46,7 +48,7 @@ extern char *md5_crypt __P ((const char *key, const char *salt));
 /* This entry point is equivalent to the `crypt' function in Unix
    libcs.  */
 char *
-md5_crypt_r (key, salt, buffer, buflen)
+__md5_crypt_r (key, salt, buffer, buflen)
      const char *key;
      const char *salt;
      char *buffer;
@@ -155,10 +157,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));
+  cp = __stpncpy (buffer, md5_salt_prefix, MAX (0, buflen));
   buflen -= sizeof (md5_salt_prefix);
 
-  cp = stpncpy (cp, salt, MIN ((size_t) buflen, salt_len));
+  cp = __stpncpy (cp, salt, MIN ((size_t) buflen, salt_len));
   buflen -= MIN ((size_t) buflen, salt_len);
 
   if (buflen > 0)
@@ -201,10 +203,11 @@ md5_crypt_r (key, salt, buffer, buflen)
 
   return buffer;
 }
+weak_alias (__md5_crypt_r, md5_crypt_r)
 
 
 char *
-md5_crypt (key, salt)
+__md5_crypt (key, salt)
      const char *key;
      const char *salt;
 {
@@ -222,5 +225,6 @@ md5_crypt (key, salt)
 	return NULL;
     }
 
-  return md5_crypt_r (key, salt, buffer, buflen);
+  return __md5_crypt_r (key, salt, buffer, buflen);
 }
+weak_alias (__md5_crypt, md5_crypt)