1997-02-15 04:31:36 +00:00
|
|
|
/* One way encryption based on MD5 sum.
|
2002-11-11 02:43:35 +00:00
|
|
|
Compatible with the behavior of MD5 crypt introduced in FreeBSD 2.0.
|
2017-01-01 00:14:16 +00:00
|
|
|
Copyright (C) 1996-2017 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
|
2012-02-09 23:18:22 +00:00
|
|
|
License along with the GNU C Library; if not, see
|
|
|
|
<http://www.gnu.org/licenses/>. */
|
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"
|
2014-06-03 11:09:08 +00:00
|
|
|
#include "crypt-private.h"
|
1996-12-15 02:15:29 +00:00
|
|
|
|
|
|
|
|
2009-04-02 17:00:46 +00:00
|
|
|
#ifdef USE_NSS
|
|
|
|
typedef int PRBool;
|
|
|
|
# include <hasht.h>
|
|
|
|
# include <nsslowhash.h>
|
|
|
|
|
|
|
|
# define md5_init_ctx(ctxp, nss_ctxp) \
|
|
|
|
do \
|
|
|
|
{ \
|
2014-05-22 06:08:50 +00:00
|
|
|
if (((nss_ctxp = NSSLOWHASH_NewContext (nss_ictx, HASH_AlgMD5)) \
|
2009-04-02 17:00:46 +00:00
|
|
|
== NULL)) \
|
|
|
|
{ \
|
|
|
|
if (nss_ctx != NULL) \
|
|
|
|
NSSLOWHASH_Destroy (nss_ctx); \
|
|
|
|
if (nss_alt_ctx != NULL) \
|
|
|
|
NSSLOWHASH_Destroy (nss_alt_ctx); \
|
|
|
|
return NULL; \
|
|
|
|
} \
|
|
|
|
NSSLOWHASH_Begin (nss_ctxp); \
|
|
|
|
} \
|
|
|
|
while (0)
|
|
|
|
|
|
|
|
# define md5_process_bytes(buf, len, ctxp, nss_ctxp) \
|
|
|
|
NSSLOWHASH_Update (nss_ctxp, (const unsigned char *) buf, len)
|
|
|
|
|
|
|
|
# define md5_finish_ctx(ctxp, nss_ctxp, result) \
|
|
|
|
do \
|
|
|
|
{ \
|
|
|
|
unsigned int ret; \
|
|
|
|
NSSLOWHASH_End (nss_ctxp, result, &ret, sizeof (result)); \
|
|
|
|
assert (ret == sizeof (result)); \
|
|
|
|
NSSLOWHASH_Destroy (nss_ctxp); \
|
|
|
|
nss_ctxp = NULL; \
|
|
|
|
} \
|
|
|
|
while (0)
|
|
|
|
#else
|
|
|
|
# define md5_init_ctx(ctxp, nss_ctxp) \
|
|
|
|
__md5_init_ctx (ctxp)
|
|
|
|
|
|
|
|
# define md5_process_bytes(buf, len, ctxp, nss_ctxp) \
|
|
|
|
__md5_process_bytes(buf, len, ctxp)
|
|
|
|
|
|
|
|
# define md5_finish_ctx(ctxp, nss_ctxp, result) \
|
|
|
|
__md5_finish_ctx (ctxp, result)
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
1996-12-15 02:15:29 +00:00
|
|
|
/* 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$";
|
|
|
|
|
|
|
|
|
|
|
|
/* 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 *
|
2015-10-20 11:54:09 +00:00
|
|
|
__md5_crypt_r (const char *key, const char *salt, char *buffer, int buflen)
|
1996-12-15 02:15:29 +00:00
|
|
|
{
|
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
|
|
|
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;
|
2012-03-30 15:45:44 +00:00
|
|
|
char *free_key = NULL;
|
|
|
|
size_t alloca_used = 0;
|
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)
|
|
|
|
{
|
2012-03-30 15:45:44 +00:00
|
|
|
char *tmp;
|
|
|
|
|
|
|
|
if (__libc_use_alloca (alloca_used + key_len + __alignof__ (md5_uint32)))
|
|
|
|
tmp = (char *) alloca (key_len + __alignof__ (md5_uint32));
|
|
|
|
else
|
|
|
|
{
|
|
|
|
free_key = tmp = (char *) malloc (key_len + __alignof__ (md5_uint32));
|
|
|
|
if (tmp == NULL)
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
2009-04-02 17:00:46 +00:00
|
|
|
#ifdef USE_NSS
|
|
|
|
/* Initialize libfreebl3. */
|
|
|
|
NSSLOWInitContext *nss_ictx = NSSLOW_Init ();
|
|
|
|
if (nss_ictx == NULL)
|
2012-03-30 15:45:44 +00:00
|
|
|
{
|
|
|
|
free (free_key);
|
|
|
|
return NULL;
|
|
|
|
}
|
2009-04-02 17:00:46 +00:00
|
|
|
NSSLOWHASHContext *nss_ctx = NULL;
|
|
|
|
NSSLOWHASHContext *nss_alt_ctx = NULL;
|
|
|
|
#else
|
|
|
|
struct md5_ctx ctx;
|
|
|
|
struct md5_ctx alt_ctx;
|
|
|
|
#endif
|
|
|
|
|
1996-12-15 02:15:29 +00:00
|
|
|
/* Prepare for the real work. */
|
2009-04-02 17:00:46 +00:00
|
|
|
md5_init_ctx (&ctx, nss_ctx);
|
1996-12-15 02:15:29 +00:00
|
|
|
|
|
|
|
/* Add the key string. */
|
2009-04-02 17:00:46 +00:00
|
|
|
md5_process_bytes (key, key_len, &ctx, nss_ctx);
|
1996-12-15 02:15:29 +00:00
|
|
|
|
|
|
|
/* Because the SALT argument need not always have the salt prefix we
|
|
|
|
add it separately. */
|
2009-04-02 17:00:46 +00:00
|
|
|
md5_process_bytes (md5_salt_prefix, sizeof (md5_salt_prefix) - 1,
|
|
|
|
&ctx, nss_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
|
2007-05-29 19:22:56 +00:00
|
|
|
compatibility with existing implementations). */
|
2009-04-02 17:00:46 +00:00
|
|
|
md5_process_bytes (salt, salt_len, &ctx, nss_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. */
|
2009-04-02 17:00:46 +00:00
|
|
|
md5_init_ctx (&alt_ctx, nss_alt_ctx);
|
1996-12-15 02:15:29 +00:00
|
|
|
|
|
|
|
/* Add key. */
|
2009-04-02 17:00:46 +00:00
|
|
|
md5_process_bytes (key, key_len, &alt_ctx, nss_alt_ctx);
|
1996-12-15 02:15:29 +00:00
|
|
|
|
|
|
|
/* Add salt. */
|
2009-04-02 17:00:46 +00:00
|
|
|
md5_process_bytes (salt, salt_len, &alt_ctx, nss_alt_ctx);
|
1996-12-15 02:15:29 +00:00
|
|
|
|
|
|
|
/* Add key again. */
|
2009-04-02 17:00:46 +00:00
|
|
|
md5_process_bytes (key, key_len, &alt_ctx, nss_alt_ctx);
|
1996-12-15 02:15:29 +00:00
|
|
|
|
|
|
|
/* Now get result of this (16 bytes) and add it to the other
|
|
|
|
context. */
|
2009-04-02 17:00:46 +00:00
|
|
|
md5_finish_ctx (&alt_ctx, nss_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)
|
2009-04-02 17:00:46 +00:00
|
|
|
md5_process_bytes (alt_result, 16, &ctx, nss_ctx);
|
|
|
|
md5_process_bytes (alt_result, cnt, &ctx, nss_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)
|
2009-04-02 17:00:46 +00:00
|
|
|
md5_process_bytes ((cnt & 1) != 0
|
|
|
|
? (const void *) alt_result : (const void *) key, 1,
|
|
|
|
&ctx, nss_ctx);
|
1996-12-15 02:15:29 +00:00
|
|
|
|
|
|
|
/* Create intermediate result. */
|
2009-04-02 17:00:46 +00:00
|
|
|
md5_finish_ctx (&ctx, nss_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. */
|
2009-04-02 17:00:46 +00:00
|
|
|
md5_init_ctx (&ctx, nss_ctx);
|
1996-12-15 02:15:29 +00:00
|
|
|
|
|
|
|
/* Add key or last result. */
|
|
|
|
if ((cnt & 1) != 0)
|
2009-04-02 17:00:46 +00:00
|
|
|
md5_process_bytes (key, key_len, &ctx, nss_ctx);
|
1996-12-15 02:15:29 +00:00
|
|
|
else
|
2009-04-02 17:00:46 +00:00
|
|
|
md5_process_bytes (alt_result, 16, &ctx, nss_ctx);
|
1996-12-15 02:15:29 +00:00
|
|
|
|
|
|
|
/* Add salt for numbers not divisible by 3. */
|
|
|
|
if (cnt % 3 != 0)
|
2009-04-02 17:00:46 +00:00
|
|
|
md5_process_bytes (salt, salt_len, &ctx, nss_ctx);
|
1996-12-15 02:15:29 +00:00
|
|
|
|
|
|
|
/* Add key for numbers not divisible by 7. */
|
|
|
|
if (cnt % 7 != 0)
|
2009-04-02 17:00:46 +00:00
|
|
|
md5_process_bytes (key, key_len, &ctx, nss_ctx);
|
1996-12-15 02:15:29 +00:00
|
|
|
|
|
|
|
/* Add key or last result. */
|
|
|
|
if ((cnt & 1) != 0)
|
2009-04-02 17:00:46 +00:00
|
|
|
md5_process_bytes (alt_result, 16, &ctx, nss_ctx);
|
1996-12-15 02:15:29 +00:00
|
|
|
else
|
2009-04-02 17:00:46 +00:00
|
|
|
md5_process_bytes (key, key_len, &ctx, nss_ctx);
|
1996-12-15 02:15:29 +00:00
|
|
|
|
|
|
|
/* Create intermediate result. */
|
2009-04-02 17:00:46 +00:00
|
|
|
md5_finish_ctx (&ctx, nss_ctx, alt_result);
|
1996-12-15 02:15:29 +00:00
|
|
|
}
|
|
|
|
|
2009-04-02 17:00:46 +00:00
|
|
|
#ifdef USE_NSS
|
|
|
|
/* Free libfreebl3 resources. */
|
|
|
|
NSSLOW_Shutdown (nss_ictx);
|
|
|
|
#endif
|
|
|
|
|
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));
|
2001-08-31 01:46:47 +00:00
|
|
|
buflen -= sizeof (md5_salt_prefix) - 1;
|
1996-12-15 02:15:29 +00:00
|
|
|
|
2001-08-31 01:46:47 +00:00
|
|
|
cp = __stpncpy (cp, salt, MIN ((size_t) MAX (0, buflen), salt_len));
|
|
|
|
buflen -= MIN ((size_t) MAX (0, buflen), salt_len);
|
1996-12-15 02:15:29 +00:00
|
|
|
|
|
|
|
if (buflen > 0)
|
|
|
|
{
|
|
|
|
*cp++ = '$';
|
|
|
|
--buflen;
|
|
|
|
}
|
|
|
|
|
2014-06-03 11:09:08 +00:00
|
|
|
__b64_from_24bit (&cp, &buflen,
|
|
|
|
alt_result[0], alt_result[6], alt_result[12], 4);
|
|
|
|
__b64_from_24bit (&cp, &buflen,
|
|
|
|
alt_result[1], alt_result[7], alt_result[13], 4);
|
|
|
|
__b64_from_24bit (&cp, &buflen,
|
|
|
|
alt_result[2], alt_result[8], alt_result[14], 4);
|
|
|
|
__b64_from_24bit (&cp, &buflen,
|
|
|
|
alt_result[3], alt_result[9], alt_result[15], 4);
|
|
|
|
__b64_from_24bit (&cp, &buflen,
|
|
|
|
alt_result[4], alt_result[10], alt_result[5], 4);
|
|
|
|
__b64_from_24bit (&cp, &buflen,
|
|
|
|
0, 0, alt_result[11], 2);
|
1996-12-15 02:15:29 +00:00
|
|
|
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. */
|
2009-04-02 17:00:46 +00:00
|
|
|
#ifndef USE_NSS
|
2000-07-05 22:34:10 +00:00
|
|
|
__md5_init_ctx (&ctx);
|
|
|
|
__md5_finish_ctx (&ctx, alt_result);
|
New string function explicit_bzero (from OpenBSD).
explicit_bzero(s, n) is the same as memset(s, 0, n), except that the
compiler is not allowed to delete a call to explicit_bzero even if the
memory pointed to by 's' is dead after the call. Right now, this effect
is achieved externally by having explicit_bzero be a function whose
semantics are unknown to the compiler, and internally, with a no-op
asm statement that clobbers memory. This does mean that small
explicit_bzero operations cannot be expanded inline as small memset
operations can, but on the other hand, small memset operations do get
deleted by the compiler. Hopefully full compiler support for
explicit_bzero will happen relatively soon.
There are two new tests: test-explicit_bzero.c verifies the
visible semantics in the same way as the existing test-bzero.c,
and tst-xbzero-opt.c verifies the not-being-optimized-out property.
The latter is conceptually based on a test written by Matthew Dempsky
for the OpenBSD regression suite.
The crypt() implementation has an immediate use for this new feature.
We avoid having to add a GLIBC_PRIVATE alias for explicit_bzero
by running all of libcrypt's calls through the fortified variant,
__explicit_bzero_chk, which is in the impl namespace anyway. Currently
I'm not aware of anything in libc proper that needs this, but the
glue is all in place if it does become necessary. The legacy DES
implementation wasn't bothering to clear its buffers, so I added that,
mostly for consistency's sake.
* string/explicit_bzero.c: New routine.
* string/test-explicit_bzero.c, string/tst-xbzero-opt.c: New tests.
* string/Makefile (routines, strop-tests, tests): Add them.
* string/test-memset.c: Add ifdeffage for testing explicit_bzero.
* string/string.h [__USE_MISC]: Declare explicit_bzero.
* debug/explicit_bzero_chk.c: New routine.
* debug/Makefile (routines): Add it.
* debug/tst-chk1.c: Test fortification of explicit_bzero.
* string/bits/string3.h: Fortify explicit_bzero.
* manual/string.texi: Document explicit_bzero.
* NEWS: Mention addition of explicit_bzero.
* crypt/crypt-entry.c (__crypt_r): Clear key-dependent intermediate
data before returning, using explicit_bzero.
* crypt/md5-crypt.c (__md5_crypt_r): Likewise.
* crypt/sha256-crypt.c (__sha256_crypt_r): Likewise.
* crypt/sha512-crypt.c (__sha512_crypt_r): Likewise.
* include/string.h: Redirect internal uses of explicit_bzero
to __explicit_bzero_chk[_internal].
* string/Versions [GLIBC_2.25]: Add explicit_bzero.
* debug/Versions [GLIBC_2.25]: Add __explicit_bzero_chk.
* sysdeps/arm/nacl/libc.abilist
* sysdeps/unix/sysv/linux/aarch64/libc.abilist
* sysdeps/unix/sysv/linux/alpha/libc.abilist
* sysdeps/unix/sysv/linux/arm/libc.abilist
* sysdeps/unix/sysv/linux/hppa/libc.abilist
* sysdeps/unix/sysv/linux/i386/libc.abilist
* sysdeps/unix/sysv/linux/ia64/libc.abilist
* sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
* sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
* sysdeps/unix/sysv/linux/microblaze/libc.abilist
* sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
* sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
* sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
* sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
* sysdeps/unix/sysv/linux/nios2/libc.abilist
* sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
* sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
* sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist
* sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist
* sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
* sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
* sysdeps/unix/sysv/linux/sh/libc.abilist
* sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
* sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
* sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libc.abilist
* sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libc.abilist
* sysdeps/unix/sysv/linux/tile/tilepro/libc.abilist
* sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
* sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist:
Add entries for explicit_bzero and __explicit_bzero_chk.
2016-09-15 11:29:44 +00:00
|
|
|
explicit_bzero (&ctx, sizeof (ctx));
|
|
|
|
explicit_bzero (&alt_ctx, sizeof (alt_ctx));
|
2009-04-02 17:00:46 +00:00
|
|
|
#endif
|
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)
|
New string function explicit_bzero (from OpenBSD).
explicit_bzero(s, n) is the same as memset(s, 0, n), except that the
compiler is not allowed to delete a call to explicit_bzero even if the
memory pointed to by 's' is dead after the call. Right now, this effect
is achieved externally by having explicit_bzero be a function whose
semantics are unknown to the compiler, and internally, with a no-op
asm statement that clobbers memory. This does mean that small
explicit_bzero operations cannot be expanded inline as small memset
operations can, but on the other hand, small memset operations do get
deleted by the compiler. Hopefully full compiler support for
explicit_bzero will happen relatively soon.
There are two new tests: test-explicit_bzero.c verifies the
visible semantics in the same way as the existing test-bzero.c,
and tst-xbzero-opt.c verifies the not-being-optimized-out property.
The latter is conceptually based on a test written by Matthew Dempsky
for the OpenBSD regression suite.
The crypt() implementation has an immediate use for this new feature.
We avoid having to add a GLIBC_PRIVATE alias for explicit_bzero
by running all of libcrypt's calls through the fortified variant,
__explicit_bzero_chk, which is in the impl namespace anyway. Currently
I'm not aware of anything in libc proper that needs this, but the
glue is all in place if it does become necessary. The legacy DES
implementation wasn't bothering to clear its buffers, so I added that,
mostly for consistency's sake.
* string/explicit_bzero.c: New routine.
* string/test-explicit_bzero.c, string/tst-xbzero-opt.c: New tests.
* string/Makefile (routines, strop-tests, tests): Add them.
* string/test-memset.c: Add ifdeffage for testing explicit_bzero.
* string/string.h [__USE_MISC]: Declare explicit_bzero.
* debug/explicit_bzero_chk.c: New routine.
* debug/Makefile (routines): Add it.
* debug/tst-chk1.c: Test fortification of explicit_bzero.
* string/bits/string3.h: Fortify explicit_bzero.
* manual/string.texi: Document explicit_bzero.
* NEWS: Mention addition of explicit_bzero.
* crypt/crypt-entry.c (__crypt_r): Clear key-dependent intermediate
data before returning, using explicit_bzero.
* crypt/md5-crypt.c (__md5_crypt_r): Likewise.
* crypt/sha256-crypt.c (__sha256_crypt_r): Likewise.
* crypt/sha512-crypt.c (__sha512_crypt_r): Likewise.
* include/string.h: Redirect internal uses of explicit_bzero
to __explicit_bzero_chk[_internal].
* string/Versions [GLIBC_2.25]: Add explicit_bzero.
* debug/Versions [GLIBC_2.25]: Add __explicit_bzero_chk.
* sysdeps/arm/nacl/libc.abilist
* sysdeps/unix/sysv/linux/aarch64/libc.abilist
* sysdeps/unix/sysv/linux/alpha/libc.abilist
* sysdeps/unix/sysv/linux/arm/libc.abilist
* sysdeps/unix/sysv/linux/hppa/libc.abilist
* sysdeps/unix/sysv/linux/i386/libc.abilist
* sysdeps/unix/sysv/linux/ia64/libc.abilist
* sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
* sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
* sysdeps/unix/sysv/linux/microblaze/libc.abilist
* sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
* sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
* sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
* sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
* sysdeps/unix/sysv/linux/nios2/libc.abilist
* sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
* sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
* sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist
* sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist
* sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
* sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
* sysdeps/unix/sysv/linux/sh/libc.abilist
* sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
* sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
* sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libc.abilist
* sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libc.abilist
* sysdeps/unix/sysv/linux/tile/tilepro/libc.abilist
* sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
* sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist:
Add entries for explicit_bzero and __explicit_bzero_chk.
2016-09-15 11:29:44 +00:00
|
|
|
explicit_bzero (copied_key, key_len);
|
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_salt != NULL)
|
New string function explicit_bzero (from OpenBSD).
explicit_bzero(s, n) is the same as memset(s, 0, n), except that the
compiler is not allowed to delete a call to explicit_bzero even if the
memory pointed to by 's' is dead after the call. Right now, this effect
is achieved externally by having explicit_bzero be a function whose
semantics are unknown to the compiler, and internally, with a no-op
asm statement that clobbers memory. This does mean that small
explicit_bzero operations cannot be expanded inline as small memset
operations can, but on the other hand, small memset operations do get
deleted by the compiler. Hopefully full compiler support for
explicit_bzero will happen relatively soon.
There are two new tests: test-explicit_bzero.c verifies the
visible semantics in the same way as the existing test-bzero.c,
and tst-xbzero-opt.c verifies the not-being-optimized-out property.
The latter is conceptually based on a test written by Matthew Dempsky
for the OpenBSD regression suite.
The crypt() implementation has an immediate use for this new feature.
We avoid having to add a GLIBC_PRIVATE alias for explicit_bzero
by running all of libcrypt's calls through the fortified variant,
__explicit_bzero_chk, which is in the impl namespace anyway. Currently
I'm not aware of anything in libc proper that needs this, but the
glue is all in place if it does become necessary. The legacy DES
implementation wasn't bothering to clear its buffers, so I added that,
mostly for consistency's sake.
* string/explicit_bzero.c: New routine.
* string/test-explicit_bzero.c, string/tst-xbzero-opt.c: New tests.
* string/Makefile (routines, strop-tests, tests): Add them.
* string/test-memset.c: Add ifdeffage for testing explicit_bzero.
* string/string.h [__USE_MISC]: Declare explicit_bzero.
* debug/explicit_bzero_chk.c: New routine.
* debug/Makefile (routines): Add it.
* debug/tst-chk1.c: Test fortification of explicit_bzero.
* string/bits/string3.h: Fortify explicit_bzero.
* manual/string.texi: Document explicit_bzero.
* NEWS: Mention addition of explicit_bzero.
* crypt/crypt-entry.c (__crypt_r): Clear key-dependent intermediate
data before returning, using explicit_bzero.
* crypt/md5-crypt.c (__md5_crypt_r): Likewise.
* crypt/sha256-crypt.c (__sha256_crypt_r): Likewise.
* crypt/sha512-crypt.c (__sha512_crypt_r): Likewise.
* include/string.h: Redirect internal uses of explicit_bzero
to __explicit_bzero_chk[_internal].
* string/Versions [GLIBC_2.25]: Add explicit_bzero.
* debug/Versions [GLIBC_2.25]: Add __explicit_bzero_chk.
* sysdeps/arm/nacl/libc.abilist
* sysdeps/unix/sysv/linux/aarch64/libc.abilist
* sysdeps/unix/sysv/linux/alpha/libc.abilist
* sysdeps/unix/sysv/linux/arm/libc.abilist
* sysdeps/unix/sysv/linux/hppa/libc.abilist
* sysdeps/unix/sysv/linux/i386/libc.abilist
* sysdeps/unix/sysv/linux/ia64/libc.abilist
* sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
* sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
* sysdeps/unix/sysv/linux/microblaze/libc.abilist
* sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
* sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
* sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
* sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
* sysdeps/unix/sysv/linux/nios2/libc.abilist
* sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
* sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
* sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist
* sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist
* sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
* sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
* sysdeps/unix/sysv/linux/sh/libc.abilist
* sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
* sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
* sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libc.abilist
* sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libc.abilist
* sysdeps/unix/sysv/linux/tile/tilepro/libc.abilist
* sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
* sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist:
Add entries for explicit_bzero and __explicit_bzero_chk.
2016-09-15 11:29:44 +00:00
|
|
|
explicit_bzero (copied_salt, salt_len);
|
1996-12-15 02:15:29 +00:00
|
|
|
|
2012-03-30 15:45:44 +00:00
|
|
|
free (free_key);
|
1996-12-15 02:15:29 +00:00
|
|
|
return buffer;
|
|
|
|
}
|
|
|
|
|
2002-11-01 20:44:15 +00:00
|
|
|
#ifndef _LIBC
|
|
|
|
# define libc_freeres_ptr(decl) decl
|
|
|
|
#endif
|
|
|
|
libc_freeres_ptr (static char *buffer);
|
2000-08-15 06:12:25 +00:00
|
|
|
|
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)
|
|
|
|
{
|
2004-06-10 02:16:08 +00:00
|
|
|
char *new_buffer = (char *) realloc (buffer, needed);
|
2001-12-29 15:57:15 +00:00
|
|
|
if (new_buffer == NULL)
|
1996-12-15 02:15:29 +00:00
|
|
|
return NULL;
|
2001-12-29 15:57:15 +00:00
|
|
|
|
|
|
|
buffer = new_buffer;
|
2004-06-10 02:16:08 +00:00
|
|
|
buflen = needed;
|
1996-12-15 02:15:29 +00:00
|
|
|
}
|
|
|
|
|
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
|
|
|
|
2002-11-01 20:44:15 +00:00
|
|
|
#ifndef _LIBC
|
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);
|
|
|
|
}
|
2002-11-01 20:44:15 +00:00
|
|
|
#endif
|