1997-02-15 04:31:36 +00:00
|
|
|
/* One way encryption based on MD5 sum.
|
2000-07-04 18:24:11 +00:00
|
|
|
Copyright (C) 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
|
1997-02-15 04:31:36 +00:00
|
|
|
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
|
2001-07-06 04:58:11 +00:00
|
|
|
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.
|
1997-02-15 04:31:36 +00:00
|
|
|
|
|
|
|
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
|
2001-07-06 04:58:11 +00:00
|
|
|
Lesser General Public License for more details.
|
1997-02-15 04:31:36 +00:00
|
|
|
|
2001-07-06 04:58:11 +00:00
|
|
|
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. */
|
1996-12-15 02:15:29 +00:00
|
|
|
|
2000-07-04 18:24:11 +00:00
|
|
|
#include <assert.h>
|
1996-12-15 02:15:29 +00:00
|
|
|
#include <errno.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <sys/param.h>
|
|
|
|
|
|
|
|
#include "md5.h"
|
|
|
|
|
|
|
|
|
|
|
|
/* Define our magic string to mark salt for MD5 "encryption"
|
|
|
|
replacement. This is meant to be the same as for other MD5 based
|
|
|
|
encryption implementations. */
|
|
|
|
static const char md5_salt_prefix[] = "$1$";
|
|
|
|
|
|
|
|
/* Table with characters for base64 transformation. */
|
|
|
|
static const char b64t[64] =
|
|
|
|
"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
|
|
|
|
|
|
|
|
|
|
|
|
/* Prototypes for local functions. */
|
2000-07-04 18:24:11 +00:00
|
|
|
extern char *__md5_crypt_r (const char *key, const char *salt,
|
|
|
|
char *buffer, int buflen);
|
|
|
|
extern char *__md5_crypt (const char *key, const char *salt);
|
1996-12-15 02:15:29 +00:00
|
|
|
|
|
|
|
|
|
|
|
/* This entry point is equivalent to the `crypt' function in Unix
|
|
|
|
libcs. */
|
|
|
|
char *
|
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".
1997-06-03 21:53:09 +00:00
|
|
|
__md5_crypt_r (key, salt, buffer, buflen)
|
1996-12-15 02:15:29 +00:00
|
|
|
const char *key;
|
|
|
|
const char *salt;
|
|
|
|
char *buffer;
|
|
|
|
int buflen;
|
|
|
|
{
|
2000-07-04 18:24:11 +00:00
|
|
|
unsigned char alt_result[16]
|
|
|
|
__attribute__ ((__aligned__ (__alignof__ (md5_uint32))));
|
1996-12-15 02:15:29 +00:00
|
|
|
struct md5_ctx ctx;
|
|
|
|
struct md5_ctx alt_ctx;
|
|
|
|
size_t salt_len;
|
|
|
|
size_t key_len;
|
|
|
|
size_t cnt;
|
|
|
|
char *cp;
|
Update.
2000-07-24 Jakub Jelinek <jakub@redhat.com>
* libio/wfiledoalloc.c (_IO_wfile_doallocate): Measure size
in wide characters, not bytes.
* libio/tst_putwc.c (do_test): Add test for writing lots of data
into file.
2000-07-22 Bruno Haible <haible@clisp.cons.org>
* locale/nl_langinfo.c (nl_langinfo): Accept items belonging to the
new categories LC_PAPER, LC_NAME, LC_ADDRESS, LC_TELEPHONE,
LC_MEASUREMENT, LC_IDENTIFICATION.
* locale/xlocale.h (struct __locale_struct): Increase size of
__locales array.
* locale/duplocale.c (__duplocale): Copy newly added categories as
well.
* locale/freelocale.c (__freelocale): Free newly added categories.
* locale/newlocale.c (__newlocale): Fix typo in sanity check.
If a base is given, use it, don't simply return it.
2000-07-22 Bruno Haible <haible@clisp.cons.org>
* crypt/md5-crypt.c (__md5_crypt_r): Avoid gcc warnings: Use pointer
variables, copied_key and copied_salt, instead of boolean variables.
2000-07-24 21:03:16 +00:00
|
|
|
char *copied_key = NULL;
|
|
|
|
char *copied_salt = NULL;
|
1996-12-15 02:15:29 +00:00
|
|
|
|
|
|
|
/* Find beginning of salt string. The prefix should normally always
|
|
|
|
be present. Just in case it is not. */
|
|
|
|
if (strncmp (md5_salt_prefix, salt, sizeof (md5_salt_prefix) - 1) == 0)
|
|
|
|
/* Skip salt prefix. */
|
|
|
|
salt += sizeof (md5_salt_prefix) - 1;
|
|
|
|
|
|
|
|
salt_len = MIN (strcspn (salt, "$"), 8);
|
|
|
|
key_len = strlen (key);
|
|
|
|
|
2000-07-04 18:24:11 +00:00
|
|
|
if ((key - (char *) 0) % __alignof__ (md5_uint32) != 0)
|
|
|
|
{
|
|
|
|
char *tmp = (char *) alloca (key_len + __alignof__ (md5_uint32));
|
Update.
2000-07-24 Jakub Jelinek <jakub@redhat.com>
* libio/wfiledoalloc.c (_IO_wfile_doallocate): Measure size
in wide characters, not bytes.
* libio/tst_putwc.c (do_test): Add test for writing lots of data
into file.
2000-07-22 Bruno Haible <haible@clisp.cons.org>
* locale/nl_langinfo.c (nl_langinfo): Accept items belonging to the
new categories LC_PAPER, LC_NAME, LC_ADDRESS, LC_TELEPHONE,
LC_MEASUREMENT, LC_IDENTIFICATION.
* locale/xlocale.h (struct __locale_struct): Increase size of
__locales array.
* locale/duplocale.c (__duplocale): Copy newly added categories as
well.
* locale/freelocale.c (__freelocale): Free newly added categories.
* locale/newlocale.c (__newlocale): Fix typo in sanity check.
If a base is given, use it, don't simply return it.
2000-07-22 Bruno Haible <haible@clisp.cons.org>
* crypt/md5-crypt.c (__md5_crypt_r): Avoid gcc warnings: Use pointer
variables, copied_key and copied_salt, instead of boolean variables.
2000-07-24 21:03:16 +00:00
|
|
|
key = copied_key =
|
|
|
|
memcpy (tmp + __alignof__ (md5_uint32)
|
|
|
|
- (tmp - (char *) 0) % __alignof__ (md5_uint32),
|
|
|
|
key, key_len);
|
2000-07-04 18:24:11 +00:00
|
|
|
assert ((key - (char *) 0) % __alignof__ (md5_uint32) == 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((salt - (char *) 0) % __alignof__ (md5_uint32) != 0)
|
|
|
|
{
|
|
|
|
char *tmp = (char *) alloca (salt_len + __alignof__ (md5_uint32));
|
Update.
2000-07-24 Jakub Jelinek <jakub@redhat.com>
* libio/wfiledoalloc.c (_IO_wfile_doallocate): Measure size
in wide characters, not bytes.
* libio/tst_putwc.c (do_test): Add test for writing lots of data
into file.
2000-07-22 Bruno Haible <haible@clisp.cons.org>
* locale/nl_langinfo.c (nl_langinfo): Accept items belonging to the
new categories LC_PAPER, LC_NAME, LC_ADDRESS, LC_TELEPHONE,
LC_MEASUREMENT, LC_IDENTIFICATION.
* locale/xlocale.h (struct __locale_struct): Increase size of
__locales array.
* locale/duplocale.c (__duplocale): Copy newly added categories as
well.
* locale/freelocale.c (__freelocale): Free newly added categories.
* locale/newlocale.c (__newlocale): Fix typo in sanity check.
If a base is given, use it, don't simply return it.
2000-07-22 Bruno Haible <haible@clisp.cons.org>
* crypt/md5-crypt.c (__md5_crypt_r): Avoid gcc warnings: Use pointer
variables, copied_key and copied_salt, instead of boolean variables.
2000-07-24 21:03:16 +00:00
|
|
|
salt = copied_salt =
|
|
|
|
memcpy (tmp + __alignof__ (md5_uint32)
|
|
|
|
- (tmp - (char *) 0) % __alignof__ (md5_uint32),
|
|
|
|
salt, salt_len);
|
2000-07-04 18:24:11 +00:00
|
|
|
assert ((salt - (char *) 0) % __alignof__ (md5_uint32) == 0);
|
|
|
|
}
|
|
|
|
|
1996-12-15 02:15:29 +00:00
|
|
|
/* Prepare for the real work. */
|
1999-10-25 20:18:27 +00:00
|
|
|
__md5_init_ctx (&ctx);
|
1996-12-15 02:15:29 +00:00
|
|
|
|
|
|
|
/* Add the key string. */
|
1999-10-25 20:18:27 +00:00
|
|
|
__md5_process_bytes (key, key_len, &ctx);
|
1996-12-15 02:15:29 +00:00
|
|
|
|
|
|
|
/* Because the SALT argument need not always have the salt prefix we
|
|
|
|
add it separately. */
|
1999-10-25 20:18:27 +00:00
|
|
|
__md5_process_bytes (md5_salt_prefix, sizeof (md5_salt_prefix) - 1, &ctx);
|
1996-12-15 02:15:29 +00:00
|
|
|
|
|
|
|
/* The last part is the salt string. This must be at most 8
|
|
|
|
characters and it ends at the first `$' character (for
|
|
|
|
compatibility which existing solutions). */
|
1999-10-25 20:18:27 +00:00
|
|
|
__md5_process_bytes (salt, salt_len, &ctx);
|
1996-12-15 02:15:29 +00:00
|
|
|
|
|
|
|
|
|
|
|
/* Compute alternate MD5 sum with input KEY, SALT, and KEY. The
|
|
|
|
final result will be added to the first context. */
|
1999-10-25 20:18:27 +00:00
|
|
|
__md5_init_ctx (&alt_ctx);
|
1996-12-15 02:15:29 +00:00
|
|
|
|
|
|
|
/* Add key. */
|
1999-10-25 20:18:27 +00:00
|
|
|
__md5_process_bytes (key, key_len, &alt_ctx);
|
1996-12-15 02:15:29 +00:00
|
|
|
|
|
|
|
/* Add salt. */
|
1999-10-25 20:18:27 +00:00
|
|
|
__md5_process_bytes (salt, salt_len, &alt_ctx);
|
1996-12-15 02:15:29 +00:00
|
|
|
|
|
|
|
/* Add key again. */
|
1999-10-25 20:18:27 +00:00
|
|
|
__md5_process_bytes (key, key_len, &alt_ctx);
|
1996-12-15 02:15:29 +00:00
|
|
|
|
|
|
|
/* Now get result of this (16 bytes) and add it to the other
|
|
|
|
context. */
|
1999-10-25 20:18:27 +00:00
|
|
|
__md5_finish_ctx (&alt_ctx, alt_result);
|
1996-12-15 02:15:29 +00:00
|
|
|
|
|
|
|
/* Add for any character in the key one byte of the alternate sum. */
|
|
|
|
for (cnt = key_len; cnt > 16; cnt -= 16)
|
1999-10-25 20:18:27 +00:00
|
|
|
__md5_process_bytes (alt_result, 16, &ctx);
|
|
|
|
__md5_process_bytes (alt_result, cnt, &ctx);
|
1996-12-15 02:15:29 +00:00
|
|
|
|
|
|
|
/* For the following code we need a NUL byte. */
|
|
|
|
*alt_result = '\0';
|
|
|
|
|
|
|
|
/* The original implementation now does something weird: for every 1
|
|
|
|
bit in the key the first 0 is added to the buffer, for every 0
|
|
|
|
bit the first character of the key. This does not seem to be
|
|
|
|
what was intended but we have to follow this to be compatible. */
|
|
|
|
for (cnt = key_len; cnt > 0; cnt >>= 1)
|
1999-10-25 20:18:27 +00:00
|
|
|
__md5_process_bytes ((cnt & 1) != 0 ? (const char *) alt_result : key, 1,
|
|
|
|
&ctx);
|
1996-12-15 02:15:29 +00:00
|
|
|
|
|
|
|
/* Create intermediate result. */
|
1999-10-25 20:18:27 +00:00
|
|
|
__md5_finish_ctx (&ctx, alt_result);
|
1996-12-15 02:15:29 +00:00
|
|
|
|
|
|
|
/* Now comes another weirdness. In fear of password crackers here
|
|
|
|
comes a quite long loop which just processes the output of the
|
|
|
|
previous round again. We cannot ignore this here. */
|
|
|
|
for (cnt = 0; cnt < 1000; ++cnt)
|
|
|
|
{
|
|
|
|
/* New context. */
|
1999-10-25 20:18:27 +00:00
|
|
|
__md5_init_ctx (&ctx);
|
1996-12-15 02:15:29 +00:00
|
|
|
|
|
|
|
/* Add key or last result. */
|
|
|
|
if ((cnt & 1) != 0)
|
1999-10-25 20:18:27 +00:00
|
|
|
__md5_process_bytes (key, key_len, &ctx);
|
1996-12-15 02:15:29 +00:00
|
|
|
else
|
1999-10-25 20:18:27 +00:00
|
|
|
__md5_process_bytes (alt_result, 16, &ctx);
|
1996-12-15 02:15:29 +00:00
|
|
|
|
|
|
|
/* Add salt for numbers not divisible by 3. */
|
|
|
|
if (cnt % 3 != 0)
|
1999-10-25 20:18:27 +00:00
|
|
|
__md5_process_bytes (salt, salt_len, &ctx);
|
1996-12-15 02:15:29 +00:00
|
|
|
|
|
|
|
/* Add key for numbers not divisible by 7. */
|
|
|
|
if (cnt % 7 != 0)
|
1999-10-25 20:18:27 +00:00
|
|
|
__md5_process_bytes (key, key_len, &ctx);
|
1996-12-15 02:15:29 +00:00
|
|
|
|
|
|
|
/* Add key or last result. */
|
|
|
|
if ((cnt & 1) != 0)
|
1999-10-25 20:18:27 +00:00
|
|
|
__md5_process_bytes (alt_result, 16, &ctx);
|
1996-12-15 02:15:29 +00:00
|
|
|
else
|
1999-10-25 20:18:27 +00:00
|
|
|
__md5_process_bytes (key, key_len, &ctx);
|
1996-12-15 02:15:29 +00:00
|
|
|
|
|
|
|
/* Create intermediate result. */
|
1999-10-25 20:18:27 +00:00
|
|
|
__md5_finish_ctx (&ctx, alt_result);
|
1996-12-15 02:15:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Now we can construct the result string. It consists of three
|
|
|
|
parts. */
|
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".
1997-06-03 21:53:09 +00:00
|
|
|
cp = __stpncpy (buffer, md5_salt_prefix, MAX (0, buflen));
|
1996-12-15 02:15:29 +00:00
|
|
|
buflen -= sizeof (md5_salt_prefix);
|
|
|
|
|
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".
1997-06-03 21:53:09 +00:00
|
|
|
cp = __stpncpy (cp, salt, MIN ((size_t) buflen, salt_len));
|
1996-12-15 02:15:29 +00:00
|
|
|
buflen -= MIN ((size_t) buflen, salt_len);
|
|
|
|
|
|
|
|
if (buflen > 0)
|
|
|
|
{
|
|
|
|
*cp++ = '$';
|
|
|
|
--buflen;
|
|
|
|
}
|
|
|
|
|
|
|
|
#define b64_from_24bit(B2, B1, B0, N) \
|
|
|
|
do { \
|
|
|
|
unsigned int w = ((B2) << 16) | ((B1) << 8) | (B0); \
|
|
|
|
int n = (N); \
|
|
|
|
while (n-- > 0 && buflen > 0) \
|
|
|
|
{ \
|
|
|
|
*cp++ = b64t[w & 0x3f]; \
|
|
|
|
--buflen; \
|
|
|
|
w >>= 6; \
|
|
|
|
} \
|
|
|
|
} while (0)
|
|
|
|
|
|
|
|
|
|
|
|
b64_from_24bit (alt_result[0], alt_result[6], alt_result[12], 4);
|
|
|
|
b64_from_24bit (alt_result[1], alt_result[7], alt_result[13], 4);
|
|
|
|
b64_from_24bit (alt_result[2], alt_result[8], alt_result[14], 4);
|
|
|
|
b64_from_24bit (alt_result[3], alt_result[9], alt_result[15], 4);
|
|
|
|
b64_from_24bit (alt_result[4], alt_result[10], alt_result[5], 4);
|
|
|
|
b64_from_24bit (0, 0, alt_result[11], 2);
|
|
|
|
if (buflen <= 0)
|
|
|
|
{
|
|
|
|
__set_errno (ERANGE);
|
|
|
|
buffer = NULL;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
*cp = '\0'; /* Terminate the string. */
|
|
|
|
|
|
|
|
/* Clear the buffer for the intermediate result so that people
|
|
|
|
attaching to processes or reading core dumps cannot get any
|
2000-07-05 22:34:10 +00:00
|
|
|
information. We do it in this way to clear correct_words[]
|
|
|
|
inside the MD5 implementation as well. */
|
|
|
|
__md5_init_ctx (&ctx);
|
|
|
|
__md5_finish_ctx (&ctx, alt_result);
|
|
|
|
memset (&ctx, '\0', sizeof (ctx));
|
|
|
|
memset (&alt_ctx, '\0', sizeof (alt_ctx));
|
Update.
2000-07-24 Jakub Jelinek <jakub@redhat.com>
* libio/wfiledoalloc.c (_IO_wfile_doallocate): Measure size
in wide characters, not bytes.
* libio/tst_putwc.c (do_test): Add test for writing lots of data
into file.
2000-07-22 Bruno Haible <haible@clisp.cons.org>
* locale/nl_langinfo.c (nl_langinfo): Accept items belonging to the
new categories LC_PAPER, LC_NAME, LC_ADDRESS, LC_TELEPHONE,
LC_MEASUREMENT, LC_IDENTIFICATION.
* locale/xlocale.h (struct __locale_struct): Increase size of
__locales array.
* locale/duplocale.c (__duplocale): Copy newly added categories as
well.
* locale/freelocale.c (__freelocale): Free newly added categories.
* locale/newlocale.c (__newlocale): Fix typo in sanity check.
If a base is given, use it, don't simply return it.
2000-07-22 Bruno Haible <haible@clisp.cons.org>
* crypt/md5-crypt.c (__md5_crypt_r): Avoid gcc warnings: Use pointer
variables, copied_key and copied_salt, instead of boolean variables.
2000-07-24 21:03:16 +00:00
|
|
|
if (copied_key != NULL)
|
|
|
|
memset (copied_key, '\0', key_len);
|
|
|
|
if (copied_salt != NULL)
|
|
|
|
memset (copied_salt, '\0', salt_len);
|
1996-12-15 02:15:29 +00:00
|
|
|
|
|
|
|
return buffer;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2000-08-15 06:12:25 +00:00
|
|
|
static char *buffer;
|
|
|
|
|
1996-12-15 02:15:29 +00:00
|
|
|
char *
|
1999-10-25 20:18:27 +00:00
|
|
|
__md5_crypt (const char *key, const char *salt)
|
1996-12-15 02:15:29 +00:00
|
|
|
{
|
|
|
|
/* We don't want to have an arbitrary limit in the size of the
|
|
|
|
password. We can compute the size of the result in advance and
|
|
|
|
so we can prepare the buffer we pass to `md5_crypt_r'. */
|
2000-08-15 06:12:25 +00:00
|
|
|
static int buflen;
|
1996-12-15 02:15:29 +00:00
|
|
|
int needed = 3 + strlen (salt) + 1 + 26 + 1;
|
|
|
|
|
|
|
|
if (buflen < needed)
|
|
|
|
{
|
|
|
|
buflen = needed;
|
|
|
|
if ((buffer = realloc (buffer, buflen)) == NULL)
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
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".
1997-06-03 21:53:09 +00:00
|
|
|
return __md5_crypt_r (key, salt, buffer, buflen);
|
1996-12-15 02:15:29 +00:00
|
|
|
}
|
2000-08-15 06:12:25 +00:00
|
|
|
|
|
|
|
|
|
|
|
static void
|
2000-08-24 06:11:27 +00:00
|
|
|
__attribute__ ((__destructor__))
|
2000-08-15 06:12:25 +00:00
|
|
|
free_mem (void)
|
|
|
|
{
|
|
|
|
free (buffer);
|
|
|
|
}
|