mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 13:00:06 +00:00
f63f2bfdfa
This automatically-generated patch converts 69 function definitions in glibc from old-style K&R to prototype-style. This patch, covering both sysdeps and non-sysdeps files, deals with cases where the prototype needed to be wrapped over more than one line. Otherwise, exclusions and caveats are as for <https://sourceware.org/ml/libc-alpha/2015-10/msg00594.html> and <https://sourceware.org/ml/libc-alpha/2015-10/msg00599.html>. Tested for x86_64 and x86 (testsuite, and that installed stripped shared libraries are unchanged by the patch). * crypt/crypt-entry.c (__crypt_r): Convert to prototype-style function definition. * crypt/crypt_util.c (__encrypt_r): Likewise. * libio/genops.c (_IO_no_init): Likewise. * libio/iofopncook.c (_IO_fopencookie): Likewise. (_IO_old_fopencookie): Likewise. * libio/iofwrite_u.c (fwrite_unlocked): Likewise. * libio/iogetline.c (_IO_getline): Likewise. (_IO_getline_info): Likewise. * libio/iogetwline.c (_IO_getwline): Likewise. (_IO_getwline_info): Likewise. * libio/vsnprintf.c (_IO_vsnprintf): Likewise. * libio/vswprintf.c (_IO_vswprintf): Likewise. * locale/programs/simple-hash.c (insert_entry_2): Likewise. (find_entry): Likewise. (iterate_table): Likewise. (lookup): Likewise. * login/forkpty.c (forkpty): Likewise. * misc/hsearch_r.c (__hsearch_r): Likewise. * misc/select.c (__select): Likewise. * nptl/cleanup_defer_compat.c (_pthread_cleanup_pop_restore): Likewise. * nptl/old_pthread_cond_init.c (__pthread_cond_init_2_0): Likewise. * nptl/old_pthread_cond_timedwait.c (__pthread_cond_timedwait_2_0): Likewise. * nptl/pthread_barrier_init.c (__pthread_barrier_init): Likewise. * nptl/pthread_barrierattr_getpshared.c (pthread_barrierattr_getpshared): Likewise. * nptl/pthread_getschedparam.c (__pthread_getschedparam): Likewise. * nptl/pthread_mutex_setprioceiling.c (pthread_mutex_setprioceiling): Likewise. * nptl/pthread_mutexattr_getprioceiling.c (pthread_mutexattr_getprioceiling): Likewise. * nptl/pthread_rwlock_init.c (__pthread_rwlock_init): Likewise. * nptl/pthread_rwlock_timedrdlock.c (pthread_rwlock_timedrdlock): Likewise. * nptl/pthread_rwlock_timedwrlock.c (pthread_rwlock_timedwrlock): Likewise. * nptl/pthread_setschedparam.c (__pthread_setschedparam): Likewise. * socket/recvfrom.c (__recvfrom): Likewise. * socket/sendto.c (__sendto): Likewise. * socket/setsockopt.c (__setsockopt): Likewise. * stdio-common/_itoa.c (_itoa): Likewise. * stdio-common/_itowa.c (_itowa): Likewise. * stdio-common/reg-printf.c (__register_printf_specifier): Likewise. (__register_printf_function): Likewise. * stdio-common/tempname.c (__path_search): Likewise. * stdlib/addmul_1.c (mpn_addmul_1): Likewise. * stdlib/mul_1.c (mpn_mul_1): Likewise. * stdlib/random_r.c (__initstate_r): Likewise. * stdlib/setenv.c (__add_to_environ): Likewise. * stdlib/submul_1.c (mpn_submul_1): Likewise. * streams/getpmsg.c (getpmsg): Likewise. * streams/putmsg.c (putmsg): Likewise. * streams/putpmsg.c (putpmsg): Likewise. * sunrpc/clnt_raw.c (clntraw_call): Likewise. * sunrpc/clnt_tcp.c (clnttcp_call): Likewise. * sunrpc/clnt_udp.c (clntudp_create): Likewise. * sunrpc/clnt_unix.c (clntunix_call): Likewise. * sunrpc/pm_getport.c (pmap_getport): Likewise. * sunrpc/svc_udp.c (cache_get): Likewise. * sunrpc/xdr_array.c (xdr_vector): Likewise. * sysdeps/mach/hurd/getcwd.c (__canonicalize_directory_name_internal): Likewise. * sysdeps/mach/hurd/pselect.c (__pselect): Likewise. * sysdeps/mach/hurd/recvfrom.c (__recvfrom): Likewise. * sysdeps/mach/hurd/select.c (__select): Likewise. * sysdeps/posix/ttyname_r.c (getttyname_r): Likewise. * sysdeps/pthread/timer_settime.c (timer_settime): Likewise. * sysdeps/sparc/nptl/pthread_barrier_init.c (__pthread_barrier_init): Likewise. * sysdeps/unix/sysv/linux/hppa/pthread_cond_timedwait.c (__pthread_cond_timedwait): Likewise. * sysdeps/unix/sysv/linux/i386/putmsg.c (putmsg): Likewise. * sysdeps/unix/sysv/linux/s390/semtimedop.c (semtimedop): Likewise. * sysdeps/unix/sysv/linux/semtimedop.c (semtimedop): Likewise. * sysdeps/unix/sysv/linux/timer_settime.c (timer_settime): Likewise. * sysvipc/semtimedop.c (semtimedop): Likewise. * time/setitimer.c (__setitimer): Likewise. * time/strftime_l.c (emacs_strftime): Likewise.
184 lines
5.1 KiB
C
184 lines
5.1 KiB
C
/*
|
|
* UFC-crypt: ultra fast crypt(3) implementation
|
|
*
|
|
* Copyright (C) 1991-2015 Free Software Foundation, Inc.
|
|
*
|
|
* 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/>.
|
|
*
|
|
* crypt entry points
|
|
*
|
|
* @(#)crypt-entry.c 1.2 12/20/96
|
|
*
|
|
*/
|
|
|
|
#ifdef DEBUG
|
|
#include <stdio.h>
|
|
#endif
|
|
#include <string.h>
|
|
#include <errno.h>
|
|
#include <fips-private.h>
|
|
|
|
#ifndef STATIC
|
|
#define STATIC static
|
|
#endif
|
|
|
|
#include "crypt-private.h"
|
|
|
|
/* Prototypes for local functions. */
|
|
#ifndef __GNU_LIBRARY__
|
|
void _ufc_clearmem (char *start, int cnt);
|
|
#else
|
|
#define _ufc_clearmem(start, cnt) memset(start, 0, cnt)
|
|
#endif
|
|
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);
|
|
extern char *__sha256_crypt_r (const char *key, const char *salt,
|
|
char *buffer, int buflen);
|
|
extern char *__sha256_crypt (const char *key, const char *salt);
|
|
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);
|
|
|
|
/* 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$";
|
|
|
|
/* Magic string for SHA256 encryption. */
|
|
static const char sha256_salt_prefix[] = "$5$";
|
|
|
|
/* Magic string for SHA512 encryption. */
|
|
static const char sha512_salt_prefix[] = "$6$";
|
|
|
|
/* For use by the old, non-reentrant routines (crypt/encrypt/setkey) */
|
|
extern struct crypt_data _ufc_foobar;
|
|
|
|
/*
|
|
* UNIX crypt function
|
|
*/
|
|
|
|
char *
|
|
__crypt_r (const char *key, const char *salt,
|
|
struct crypt_data * __restrict data)
|
|
{
|
|
ufc_long res[4];
|
|
char ktab[9];
|
|
ufc_long xx = 25; /* to cope with GCC long long compiler bugs */
|
|
|
|
#ifdef _LIBC
|
|
/* Try to find out whether we have to use MD5 encryption replacement. */
|
|
if (strncmp (md5_salt_prefix, salt, sizeof (md5_salt_prefix) - 1) == 0)
|
|
{
|
|
/* FIPS rules out MD5 password encryption. */
|
|
if (fips_enabled_p ())
|
|
{
|
|
__set_errno (EPERM);
|
|
return NULL;
|
|
}
|
|
return __md5_crypt_r (key, salt, (char *) data,
|
|
sizeof (struct crypt_data));
|
|
}
|
|
|
|
/* Try to find out whether we have to use SHA256 encryption replacement. */
|
|
if (strncmp (sha256_salt_prefix, salt, sizeof (sha256_salt_prefix) - 1) == 0)
|
|
return __sha256_crypt_r (key, salt, (char *) data,
|
|
sizeof (struct crypt_data));
|
|
|
|
/* Try to find out whether we have to use SHA512 encryption replacement. */
|
|
if (strncmp (sha512_salt_prefix, salt, sizeof (sha512_salt_prefix) - 1) == 0)
|
|
return __sha512_crypt_r (key, salt, (char *) data,
|
|
sizeof (struct crypt_data));
|
|
#endif
|
|
|
|
/*
|
|
* Hack DES tables according to salt
|
|
*/
|
|
if (!_ufc_setup_salt_r (salt, data))
|
|
{
|
|
__set_errno (EINVAL);
|
|
return NULL;
|
|
}
|
|
|
|
/* FIPS rules out DES password encryption. */
|
|
if (fips_enabled_p ())
|
|
{
|
|
__set_errno (EPERM);
|
|
return NULL;
|
|
}
|
|
|
|
/*
|
|
* Setup key schedule
|
|
*/
|
|
_ufc_clearmem (ktab, (int) sizeof (ktab));
|
|
(void) strncpy (ktab, key, 8);
|
|
_ufc_mk_keytab_r (ktab, data);
|
|
|
|
/*
|
|
* Go for the 25 DES encryptions
|
|
*/
|
|
_ufc_clearmem ((char*) res, (int) sizeof (res));
|
|
_ufc_doit_r (xx, data, &res[0]);
|
|
|
|
/*
|
|
* Do final permutations
|
|
*/
|
|
_ufc_dofinalperm_r (res, data);
|
|
|
|
/*
|
|
* And convert back to 6 bit ASCII
|
|
*/
|
|
_ufc_output_conversion_r (res[0], res[1], salt, data);
|
|
return data->crypt_3_buf;
|
|
}
|
|
weak_alias (__crypt_r, crypt_r)
|
|
|
|
char *
|
|
crypt (const char *key, const char *salt)
|
|
{
|
|
#ifdef _LIBC
|
|
/* Try to find out whether we have to use MD5 encryption replacement. */
|
|
if (strncmp (md5_salt_prefix, salt, sizeof (md5_salt_prefix) - 1) == 0
|
|
/* Let __crypt_r deal with the error code if FIPS is enabled. */
|
|
&& !fips_enabled_p ())
|
|
return __md5_crypt (key, salt);
|
|
|
|
/* Try to find out whether we have to use SHA256 encryption replacement. */
|
|
if (strncmp (sha256_salt_prefix, salt, sizeof (sha256_salt_prefix) - 1) == 0)
|
|
return __sha256_crypt (key, salt);
|
|
|
|
/* Try to find out whether we have to use SHA512 encryption replacement. */
|
|
if (strncmp (sha512_salt_prefix, salt, sizeof (sha512_salt_prefix) - 1) == 0)
|
|
return __sha512_crypt (key, salt);
|
|
#endif
|
|
|
|
return __crypt_r (key, salt, &_ufc_foobar);
|
|
}
|
|
|
|
|
|
/*
|
|
* To make fcrypt users happy.
|
|
* They don't need to call init_des.
|
|
*/
|
|
#ifdef _LIBC
|
|
weak_alias (crypt, fcrypt)
|
|
#else
|
|
char *
|
|
__fcrypt (const char *key, const char *salt)
|
|
{
|
|
return crypt (key, salt);
|
|
}
|
|
#endif
|