mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-27 07:20:11 +00:00
9dd346ff43
This mostly automatically-generated patch converts 113 function definitions in glibc from old-style K&R to prototype-style. Following my other recent such patches, this one deals with the case of function definitions in files that either contain assertions or where grep suggested they might contain assertions - and thus where it isn't possible to use a simple object code comparison as a sanity check on the correctness of the patch, because line numbers are changed. A few such automatically-generated changes needed to be supplemented by manual changes for the result to compile. openat64 had a prototype declaration with "..." but an old-style definition in sysdeps/unix/sysv/linux/dl-openat64.c, and "..." needed adding to the generated prototype in the definition (I've filed <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68024> for diagnosing such cases in GCC; the old state was undefined behavior not requiring a diagnostic, but one seems a good idea). In addition, as Florian has noted regparm attribute mismatches between declaration and definition are only diagnosed for prototype definitions, and five functions needed internal_function added to their definitions (in the case of __pthread_mutex_cond_lock, via the macro definition of __pthread_mutex_lock) to compile on i386. After this patch is in, remaining old-style definitions are probably most readily fixed manually before we can turn on -Wold-style-definition for all builds. Tested for x86_64 and x86 (testsuite). * crypt/md5-crypt.c (__md5_crypt_r): Convert to prototype-style function definition. * crypt/sha256-crypt.c (__sha256_crypt_r): Likewise. * crypt/sha512-crypt.c (__sha512_crypt_r): Likewise. * debug/backtracesyms.c (__backtrace_symbols): Likewise. * elf/dl-minimal.c (_itoa): Likewise. * hurd/hurdmalloc.c (malloc): Likewise. (free): Likewise. (realloc): Likewise. * inet/inet6_option.c (inet6_option_space): Likewise. (inet6_option_init): Likewise. (inet6_option_append): Likewise. (inet6_option_alloc): Likewise. (inet6_option_next): Likewise. (inet6_option_find): Likewise. * io/ftw.c (FTW_NAME): Likewise. (NFTW_NAME): Likewise. (NFTW_NEW_NAME): Likewise. (NFTW_OLD_NAME): Likewise. * libio/iofwide.c (_IO_fwide): Likewise. * libio/strops.c (_IO_str_init_static_internal): Likewise. (_IO_str_init_static): Likewise. (_IO_str_init_readonly): Likewise. (_IO_str_overflow): Likewise. (_IO_str_underflow): Likewise. (_IO_str_count): Likewise. (_IO_str_seekoff): Likewise. (_IO_str_pbackfail): Likewise. (_IO_str_finish): Likewise. * libio/wstrops.c (_IO_wstr_init_static): Likewise. (_IO_wstr_overflow): Likewise. (_IO_wstr_underflow): Likewise. (_IO_wstr_count): Likewise. (_IO_wstr_seekoff): Likewise. (_IO_wstr_pbackfail): Likewise. (_IO_wstr_finish): Likewise. * locale/programs/localedef.c (normalize_codeset): Likewise. * locale/programs/locarchive.c (add_locale_to_archive): Likewise. (add_locales_to_archive): Likewise. (delete_locales_from_archive): Likewise. * malloc/malloc.c (__libc_mallinfo): Likewise. * math/gen-auto-libm-tests.c (init_fp_formats): Likewise. * misc/tsearch.c (__tfind): Likewise. * nptl/pthread_attr_destroy.c (__pthread_attr_destroy): Likewise. * nptl/pthread_attr_getdetachstate.c (__pthread_attr_getdetachstate): Likewise. * nptl/pthread_attr_getguardsize.c (pthread_attr_getguardsize): Likewise. * nptl/pthread_attr_getinheritsched.c (__pthread_attr_getinheritsched): Likewise. * nptl/pthread_attr_getschedparam.c (__pthread_attr_getschedparam): Likewise. * nptl/pthread_attr_getschedpolicy.c (__pthread_attr_getschedpolicy): Likewise. * nptl/pthread_attr_getscope.c (__pthread_attr_getscope): Likewise. * nptl/pthread_attr_getstack.c (__pthread_attr_getstack): Likewise. * nptl/pthread_attr_getstackaddr.c (__pthread_attr_getstackaddr): Likewise. * nptl/pthread_attr_getstacksize.c (__pthread_attr_getstacksize): Likewise. * nptl/pthread_attr_init.c (__pthread_attr_init_2_1): Likewise. (__pthread_attr_init_2_0): Likewise. * nptl/pthread_attr_setdetachstate.c (__pthread_attr_setdetachstate): Likewise. * nptl/pthread_attr_setguardsize.c (pthread_attr_setguardsize): Likewise. * nptl/pthread_attr_setinheritsched.c (__pthread_attr_setinheritsched): Likewise. * nptl/pthread_attr_setschedparam.c (__pthread_attr_setschedparam): Likewise. * nptl/pthread_attr_setschedpolicy.c (__pthread_attr_setschedpolicy): Likewise. * nptl/pthread_attr_setscope.c (__pthread_attr_setscope): Likewise. * nptl/pthread_attr_setstack.c (__pthread_attr_setstack): Likewise. * nptl/pthread_attr_setstackaddr.c (__pthread_attr_setstackaddr): Likewise. * nptl/pthread_attr_setstacksize.c (__pthread_attr_setstacksize): Likewise. * nptl/pthread_condattr_setclock.c (pthread_condattr_setclock): Likewise. * nptl/pthread_create.c (__find_in_stack_list): Likewise. * nptl/pthread_getattr_np.c (pthread_getattr_np): Likewise. * nptl/pthread_mutex_cond_lock.c (__pthread_mutex_lock): Define to use internal_function. * nptl/pthread_mutex_init.c (__pthread_mutex_init): Convert to prototype-style function definition. * nptl/pthread_mutex_lock.c (__pthread_mutex_lock): Likewise. (__pthread_mutex_cond_lock_adjust): Likewise. Use internal_function. * nptl/pthread_mutex_timedlock.c (pthread_mutex_timedlock): Convert to prototype-style function definition. * nptl/pthread_mutex_trylock.c (__pthread_mutex_trylock): Likewise. * nptl/pthread_mutex_unlock.c (__pthread_mutex_unlock_usercnt): Likewise. (__pthread_mutex_unlock): Likewise. * nptl_db/td_ta_clear_event.c (td_ta_clear_event): Likewise. * nptl_db/td_ta_set_event.c (td_ta_set_event): Likewise. * nptl_db/td_thr_clear_event.c (td_thr_clear_event): Likewise. * nptl_db/td_thr_event_enable.c (td_thr_event_enable): Likewise. * nptl_db/td_thr_set_event.c (td_thr_set_event): Likewise. * nss/makedb.c (process_input): Likewise. * posix/fnmatch.c (__strchrnul): Likewise. (__wcschrnul): Likewise. (fnmatch): Likewise. * posix/fnmatch_loop.c (FCT): Likewise. * posix/glob.c (globfree): Likewise. (__glob_pattern_type): Likewise. (__glob_pattern_p): Likewise. * posix/regcomp.c (re_compile_pattern): Likewise. (re_set_syntax): Likewise. (re_compile_fastmap): Likewise. (regcomp): Likewise. (regerror): Likewise. (regfree): Likewise. * posix/regexec.c (regexec): Likewise. (re_match): Likewise. (re_search): Likewise. (re_match_2): Likewise. (re_search_2): Likewise. (re_search_stub): Likewise. Use internal_function (re_copy_regs): Likewise. (re_set_registers): Convert to prototype-style function definition. (prune_impossible_nodes): Likewise. Use internal_function. * resolv/inet_net_pton.c (inet_net_pton): Convert to prototype-style function definition. (inet_net_pton_ipv4): Likewise. * stdlib/strtod_l.c (____STRTOF_INTERNAL): Likewise. * sysdeps/pthread/aio_cancel.c (aio_cancel): Likewise. * sysdeps/pthread/aio_suspend.c (aio_suspend): Likewise. * sysdeps/pthread/timer_delete.c (timer_delete): Likewise. * sysdeps/unix/sysv/linux/dl-openat64.c (openat64): Likewise. Make variadic. * time/strptime_l.c (localtime_r): Convert to prototype-style function definition. * wcsmbs/mbsnrtowcs.c (__mbsnrtowcs): Likewise. * wcsmbs/mbsrtowcs_l.c (__mbsrtowcs_l): Likewise. * wcsmbs/wcsnrtombs.c (__wcsnrtombs): Likewise. * wcsmbs/wcsrtombs.c (__wcsrtombs): Likewise.
452 lines
14 KiB
C
452 lines
14 KiB
C
/* One way encryption based on SHA512 sum.
|
|
Copyright (C) 2007-2015 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@redhat.com>, 2007.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
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
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <assert.h>
|
|
#include <errno.h>
|
|
#include <stdbool.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <stdint.h>
|
|
#include <sys/param.h>
|
|
|
|
#include "sha512.h"
|
|
#include "crypt-private.h"
|
|
|
|
|
|
#ifdef USE_NSS
|
|
typedef int PRBool;
|
|
# include <hasht.h>
|
|
# include <nsslowhash.h>
|
|
|
|
# define sha512_init_ctx(ctxp, nss_ctxp) \
|
|
do \
|
|
{ \
|
|
if (((nss_ctxp = NSSLOWHASH_NewContext (nss_ictx, HASH_AlgSHA512)) \
|
|
== 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 sha512_process_bytes(buf, len, ctxp, nss_ctxp) \
|
|
NSSLOWHASH_Update (nss_ctxp, (const unsigned char *) buf, len)
|
|
|
|
# define sha512_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 sha512_init_ctx(ctxp, nss_ctxp) \
|
|
__sha512_init_ctx (ctxp)
|
|
|
|
# define sha512_process_bytes(buf, len, ctxp, nss_ctxp) \
|
|
__sha512_process_bytes(buf, len, ctxp)
|
|
|
|
# define sha512_finish_ctx(ctxp, nss_ctxp, result) \
|
|
__sha512_finish_ctx (ctxp, result)
|
|
#endif
|
|
|
|
|
|
/* Define our magic string to mark salt for SHA512 "encryption"
|
|
replacement. */
|
|
static const char sha512_salt_prefix[] = "$6$";
|
|
|
|
/* Prefix for optional rounds specification. */
|
|
static const char sha512_rounds_prefix[] = "rounds=";
|
|
|
|
/* Maximum salt string length. */
|
|
#define SALT_LEN_MAX 16
|
|
/* Default number of rounds if not explicitly specified. */
|
|
#define ROUNDS_DEFAULT 5000
|
|
/* Minimum number of rounds. */
|
|
#define ROUNDS_MIN 1000
|
|
/* Maximum number of rounds. */
|
|
#define ROUNDS_MAX 999999999
|
|
|
|
|
|
/* Prototypes for local functions. */
|
|
extern char *__sha512_crypt_r (const char *key, const char *salt,
|
|
char *buffer, int buflen);
|
|
extern char *__sha512_crypt (const char *key, const char *salt);
|
|
|
|
|
|
char *
|
|
__sha512_crypt_r (const char *key, const char *salt, char *buffer, int buflen)
|
|
{
|
|
unsigned char alt_result[64]
|
|
__attribute__ ((__aligned__ (__alignof__ (uint64_t))));
|
|
unsigned char temp_result[64]
|
|
__attribute__ ((__aligned__ (__alignof__ (uint64_t))));
|
|
size_t salt_len;
|
|
size_t key_len;
|
|
size_t cnt;
|
|
char *cp;
|
|
char *copied_key = NULL;
|
|
char *copied_salt = NULL;
|
|
char *p_bytes;
|
|
char *s_bytes;
|
|
/* Default number of rounds. */
|
|
size_t rounds = ROUNDS_DEFAULT;
|
|
bool rounds_custom = false;
|
|
size_t alloca_used = 0;
|
|
char *free_key = NULL;
|
|
char *free_pbytes = NULL;
|
|
|
|
/* Find beginning of salt string. The prefix should normally always
|
|
be present. Just in case it is not. */
|
|
if (strncmp (sha512_salt_prefix, salt, sizeof (sha512_salt_prefix) - 1) == 0)
|
|
/* Skip salt prefix. */
|
|
salt += sizeof (sha512_salt_prefix) - 1;
|
|
|
|
if (strncmp (salt, sha512_rounds_prefix, sizeof (sha512_rounds_prefix) - 1)
|
|
== 0)
|
|
{
|
|
const char *num = salt + sizeof (sha512_rounds_prefix) - 1;
|
|
char *endp;
|
|
unsigned long int srounds = strtoul (num, &endp, 10);
|
|
if (*endp == '$')
|
|
{
|
|
salt = endp + 1;
|
|
rounds = MAX (ROUNDS_MIN, MIN (srounds, ROUNDS_MAX));
|
|
rounds_custom = true;
|
|
}
|
|
}
|
|
|
|
salt_len = MIN (strcspn (salt, "$"), SALT_LEN_MAX);
|
|
key_len = strlen (key);
|
|
|
|
if ((key - (char *) 0) % __alignof__ (uint64_t) != 0)
|
|
{
|
|
char *tmp;
|
|
|
|
if (__libc_use_alloca (alloca_used + key_len + __alignof__ (uint64_t)))
|
|
tmp = alloca_account (key_len + __alignof__ (uint64_t), alloca_used);
|
|
else
|
|
{
|
|
free_key = tmp = (char *) malloc (key_len + __alignof__ (uint64_t));
|
|
if (tmp == NULL)
|
|
return NULL;
|
|
}
|
|
|
|
key = copied_key =
|
|
memcpy (tmp + __alignof__ (uint64_t)
|
|
- (tmp - (char *) 0) % __alignof__ (uint64_t),
|
|
key, key_len);
|
|
assert ((key - (char *) 0) % __alignof__ (uint64_t) == 0);
|
|
}
|
|
|
|
if ((salt - (char *) 0) % __alignof__ (uint64_t) != 0)
|
|
{
|
|
char *tmp = (char *) alloca (salt_len + __alignof__ (uint64_t));
|
|
salt = copied_salt =
|
|
memcpy (tmp + __alignof__ (uint64_t)
|
|
- (tmp - (char *) 0) % __alignof__ (uint64_t),
|
|
salt, salt_len);
|
|
assert ((salt - (char *) 0) % __alignof__ (uint64_t) == 0);
|
|
}
|
|
|
|
#ifdef USE_NSS
|
|
/* Initialize libfreebl3. */
|
|
NSSLOWInitContext *nss_ictx = NSSLOW_Init ();
|
|
if (nss_ictx == NULL)
|
|
{
|
|
free (free_key);
|
|
return NULL;
|
|
}
|
|
NSSLOWHASHContext *nss_ctx = NULL;
|
|
NSSLOWHASHContext *nss_alt_ctx = NULL;
|
|
#else
|
|
struct sha512_ctx ctx;
|
|
struct sha512_ctx alt_ctx;
|
|
#endif
|
|
|
|
/* Prepare for the real work. */
|
|
sha512_init_ctx (&ctx, nss_ctx);
|
|
|
|
/* Add the key string. */
|
|
sha512_process_bytes (key, key_len, &ctx, nss_ctx);
|
|
|
|
/* The last part is the salt string. This must be at most 16
|
|
characters and it ends at the first `$' character. */
|
|
sha512_process_bytes (salt, salt_len, &ctx, nss_ctx);
|
|
|
|
|
|
/* Compute alternate SHA512 sum with input KEY, SALT, and KEY. The
|
|
final result will be added to the first context. */
|
|
sha512_init_ctx (&alt_ctx, nss_alt_ctx);
|
|
|
|
/* Add key. */
|
|
sha512_process_bytes (key, key_len, &alt_ctx, nss_alt_ctx);
|
|
|
|
/* Add salt. */
|
|
sha512_process_bytes (salt, salt_len, &alt_ctx, nss_alt_ctx);
|
|
|
|
/* Add key again. */
|
|
sha512_process_bytes (key, key_len, &alt_ctx, nss_alt_ctx);
|
|
|
|
/* Now get result of this (64 bytes) and add it to the other
|
|
context. */
|
|
sha512_finish_ctx (&alt_ctx, nss_alt_ctx, alt_result);
|
|
|
|
/* Add for any character in the key one byte of the alternate sum. */
|
|
for (cnt = key_len; cnt > 64; cnt -= 64)
|
|
sha512_process_bytes (alt_result, 64, &ctx, nss_ctx);
|
|
sha512_process_bytes (alt_result, cnt, &ctx, nss_ctx);
|
|
|
|
/* Take the binary representation of the length of the key and for every
|
|
1 add the alternate sum, for every 0 the key. */
|
|
for (cnt = key_len; cnt > 0; cnt >>= 1)
|
|
if ((cnt & 1) != 0)
|
|
sha512_process_bytes (alt_result, 64, &ctx, nss_ctx);
|
|
else
|
|
sha512_process_bytes (key, key_len, &ctx, nss_ctx);
|
|
|
|
/* Create intermediate result. */
|
|
sha512_finish_ctx (&ctx, nss_ctx, alt_result);
|
|
|
|
/* Start computation of P byte sequence. */
|
|
sha512_init_ctx (&alt_ctx, nss_alt_ctx);
|
|
|
|
/* For every character in the password add the entire password. */
|
|
for (cnt = 0; cnt < key_len; ++cnt)
|
|
sha512_process_bytes (key, key_len, &alt_ctx, nss_alt_ctx);
|
|
|
|
/* Finish the digest. */
|
|
sha512_finish_ctx (&alt_ctx, nss_alt_ctx, temp_result);
|
|
|
|
/* Create byte sequence P. */
|
|
if (__libc_use_alloca (alloca_used + key_len))
|
|
cp = p_bytes = (char *) alloca (key_len);
|
|
else
|
|
{
|
|
free_pbytes = cp = p_bytes = (char *)malloc (key_len);
|
|
if (free_pbytes == NULL)
|
|
{
|
|
free (free_key);
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
for (cnt = key_len; cnt >= 64; cnt -= 64)
|
|
cp = mempcpy (cp, temp_result, 64);
|
|
memcpy (cp, temp_result, cnt);
|
|
|
|
/* Start computation of S byte sequence. */
|
|
sha512_init_ctx (&alt_ctx, nss_alt_ctx);
|
|
|
|
/* For every character in the password add the entire password. */
|
|
for (cnt = 0; cnt < 16 + alt_result[0]; ++cnt)
|
|
sha512_process_bytes (salt, salt_len, &alt_ctx, nss_alt_ctx);
|
|
|
|
/* Finish the digest. */
|
|
sha512_finish_ctx (&alt_ctx, nss_alt_ctx, temp_result);
|
|
|
|
/* Create byte sequence S. */
|
|
cp = s_bytes = alloca (salt_len);
|
|
for (cnt = salt_len; cnt >= 64; cnt -= 64)
|
|
cp = mempcpy (cp, temp_result, 64);
|
|
memcpy (cp, temp_result, cnt);
|
|
|
|
/* Repeatedly run the collected hash value through SHA512 to burn
|
|
CPU cycles. */
|
|
for (cnt = 0; cnt < rounds; ++cnt)
|
|
{
|
|
/* New context. */
|
|
sha512_init_ctx (&ctx, nss_ctx);
|
|
|
|
/* Add key or last result. */
|
|
if ((cnt & 1) != 0)
|
|
sha512_process_bytes (p_bytes, key_len, &ctx, nss_ctx);
|
|
else
|
|
sha512_process_bytes (alt_result, 64, &ctx, nss_ctx);
|
|
|
|
/* Add salt for numbers not divisible by 3. */
|
|
if (cnt % 3 != 0)
|
|
sha512_process_bytes (s_bytes, salt_len, &ctx, nss_ctx);
|
|
|
|
/* Add key for numbers not divisible by 7. */
|
|
if (cnt % 7 != 0)
|
|
sha512_process_bytes (p_bytes, key_len, &ctx, nss_ctx);
|
|
|
|
/* Add key or last result. */
|
|
if ((cnt & 1) != 0)
|
|
sha512_process_bytes (alt_result, 64, &ctx, nss_ctx);
|
|
else
|
|
sha512_process_bytes (p_bytes, key_len, &ctx, nss_ctx);
|
|
|
|
/* Create intermediate result. */
|
|
sha512_finish_ctx (&ctx, nss_ctx, alt_result);
|
|
}
|
|
|
|
#ifdef USE_NSS
|
|
/* Free libfreebl3 resources. */
|
|
NSSLOW_Shutdown (nss_ictx);
|
|
#endif
|
|
|
|
/* Now we can construct the result string. It consists of three
|
|
parts. */
|
|
cp = __stpncpy (buffer, sha512_salt_prefix, MAX (0, buflen));
|
|
buflen -= sizeof (sha512_salt_prefix) - 1;
|
|
|
|
if (rounds_custom)
|
|
{
|
|
int n = snprintf (cp, MAX (0, buflen), "%s%zu$",
|
|
sha512_rounds_prefix, rounds);
|
|
cp += n;
|
|
buflen -= n;
|
|
}
|
|
|
|
cp = __stpncpy (cp, salt, MIN ((size_t) MAX (0, buflen), salt_len));
|
|
buflen -= MIN ((size_t) MAX (0, buflen), salt_len);
|
|
|
|
if (buflen > 0)
|
|
{
|
|
*cp++ = '$';
|
|
--buflen;
|
|
}
|
|
|
|
__b64_from_24bit (&cp, &buflen,
|
|
alt_result[0], alt_result[21], alt_result[42], 4);
|
|
__b64_from_24bit (&cp, &buflen,
|
|
alt_result[22], alt_result[43], alt_result[1], 4);
|
|
__b64_from_24bit (&cp, &buflen,
|
|
alt_result[44], alt_result[2], alt_result[23], 4);
|
|
__b64_from_24bit (&cp, &buflen,
|
|
alt_result[3], alt_result[24], alt_result[45], 4);
|
|
__b64_from_24bit (&cp, &buflen,
|
|
alt_result[25], alt_result[46], alt_result[4], 4);
|
|
__b64_from_24bit (&cp, &buflen,
|
|
alt_result[47], alt_result[5], alt_result[26], 4);
|
|
__b64_from_24bit (&cp, &buflen,
|
|
alt_result[6], alt_result[27], alt_result[48], 4);
|
|
__b64_from_24bit (&cp, &buflen,
|
|
alt_result[28], alt_result[49], alt_result[7], 4);
|
|
__b64_from_24bit (&cp, &buflen,
|
|
alt_result[50], alt_result[8], alt_result[29], 4);
|
|
__b64_from_24bit (&cp, &buflen,
|
|
alt_result[9], alt_result[30], alt_result[51], 4);
|
|
__b64_from_24bit (&cp, &buflen,
|
|
alt_result[31], alt_result[52], alt_result[10], 4);
|
|
__b64_from_24bit (&cp, &buflen,
|
|
alt_result[53], alt_result[11], alt_result[32], 4);
|
|
__b64_from_24bit (&cp, &buflen,
|
|
alt_result[12], alt_result[33], alt_result[54], 4);
|
|
__b64_from_24bit (&cp, &buflen,
|
|
alt_result[34], alt_result[55], alt_result[13], 4);
|
|
__b64_from_24bit (&cp, &buflen,
|
|
alt_result[56], alt_result[14], alt_result[35], 4);
|
|
__b64_from_24bit (&cp, &buflen,
|
|
alt_result[15], alt_result[36], alt_result[57], 4);
|
|
__b64_from_24bit (&cp, &buflen,
|
|
alt_result[37], alt_result[58], alt_result[16], 4);
|
|
__b64_from_24bit (&cp, &buflen,
|
|
alt_result[59], alt_result[17], alt_result[38], 4);
|
|
__b64_from_24bit (&cp, &buflen,
|
|
alt_result[18], alt_result[39], alt_result[60], 4);
|
|
__b64_from_24bit (&cp, &buflen,
|
|
alt_result[40], alt_result[61], alt_result[19], 4);
|
|
__b64_from_24bit (&cp, &buflen,
|
|
alt_result[62], alt_result[20], alt_result[41], 4);
|
|
__b64_from_24bit (&cp, &buflen,
|
|
0, 0, alt_result[63], 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
|
|
information. We do it in this way to clear correct_words[]
|
|
inside the SHA512 implementation as well. */
|
|
#ifndef USE_NSS
|
|
__sha512_init_ctx (&ctx);
|
|
__sha512_finish_ctx (&ctx, alt_result);
|
|
memset (&ctx, '\0', sizeof (ctx));
|
|
memset (&alt_ctx, '\0', sizeof (alt_ctx));
|
|
#endif
|
|
memset (temp_result, '\0', sizeof (temp_result));
|
|
memset (p_bytes, '\0', key_len);
|
|
memset (s_bytes, '\0', salt_len);
|
|
if (copied_key != NULL)
|
|
memset (copied_key, '\0', key_len);
|
|
if (copied_salt != NULL)
|
|
memset (copied_salt, '\0', salt_len);
|
|
|
|
free (free_key);
|
|
free (free_pbytes);
|
|
return buffer;
|
|
}
|
|
|
|
#ifndef _LIBC
|
|
# define libc_freeres_ptr(decl) decl
|
|
#endif
|
|
libc_freeres_ptr (static char *buffer);
|
|
|
|
/* This entry point is equivalent to the `crypt' function in Unix
|
|
libcs. */
|
|
char *
|
|
__sha512_crypt (const char *key, const char *salt)
|
|
{
|
|
/* We don't want to have an arbitrary limit in the size of the
|
|
password. We can compute an upper bound for the size of the
|
|
result in advance and so we can prepare the buffer we pass to
|
|
`sha512_crypt_r'. */
|
|
static int buflen;
|
|
int needed = (sizeof (sha512_salt_prefix) - 1
|
|
+ sizeof (sha512_rounds_prefix) + 9 + 1
|
|
+ strlen (salt) + 1 + 86 + 1);
|
|
|
|
if (buflen < needed)
|
|
{
|
|
char *new_buffer = (char *) realloc (buffer, needed);
|
|
if (new_buffer == NULL)
|
|
return NULL;
|
|
|
|
buffer = new_buffer;
|
|
buflen = needed;
|
|
}
|
|
|
|
return __sha512_crypt_r (key, salt, buffer, buflen);
|
|
}
|
|
|
|
#ifndef _LIBC
|
|
static void
|
|
__attribute__ ((__destructor__))
|
|
free_mem (void)
|
|
{
|
|
free (buffer);
|
|
}
|
|
#endif
|