mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2025-01-06 12:09:26 +08:00
698be2d8e5
This fixes two issues on Windows: Update. https://sourceware.org/pipermail/gdb-patches/2020-June/169978.html gnulib/ChangeLog: 2020-08-26 Christian Biesinger <cbiesinger@google.com> Pedro Alves <palves@redhat.com> Joel Brobecker <brobecker@adacore.com> * Makefile.in: Regenerate. * aclocal.m4: Regenerate. * config.in: Regenerate. * configure: Regenerate. * import/Makefile.am: Update. * import/Makefile.in: Regenerate. * import/alloca.in.h (if): Update. * import/assure.h (affirm): Update. * import/at-func.c: Update. * import/attribute.h: New file. * import/btowc.c: New file. * import/canonicalize-lgpl.c: Update. * import/count-one-bits.h (COUNT_ONE_BITS_GENERIC): Update. (COUNT_ONE_BITS): Update. (intrinsic): Update. (__popcnt64): Update. (popcount_supported): Update. * import/ctype.in.h: New file. * import/dirent-private.h (WIN32_FIND_DATA): Update. * import/dirent.in.h (_GL_ATTRIBUTE_PURE): Update. * import/dirname.h: Update. * import/dosname.h: Remove. * import/error.h (_GL_ATTRIBUTE_FORMAT): Update. * import/extra/update-copyright: Update. * import/fchdir.c: Update. * import/fcntl.in.h (GNULIB_defined_rpl_fcntl): Update. (GNULIB_defined_fcntl): Update. * import/filename.h (HAS_DEVICE): Update. (IS_ABSOLUTE_PATH): Update. (IS_PATH_WITH_DIR): Update. (FILE_SYSTEM_PREFIX_LEN): Update. (_IS_DRIVE_LETTER): Update. (FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE): Update. (IS_ABSOLUTE_FILE_NAME): Update. (IS_RELATIVE_FILE_NAME): Update. (IS_FILE_NAME_WITH_DIR): Update. * import/filenamecat-lgpl.c (mfile_name_concat): Update. * import/fnmatch.c (WIDE_CHAR_SUPPORT): Update. (btowc): Update. (iswctype): Update. (mempcpy): Update. (strnlen): Update. (towlower): Update. (wcscat): Update. (wcslen): Update. (wctype): Update. (wmemchr): Update. (wmempcpy): Update. (SIZE_MAX): Update. (isblank): Update. (__libc_use_alloca): Update. (alloca): Update. (alloca_account): Update. (STREQ): Update. (CHAR_CLASS_MAX_LENGTH): Update. (IS_CHAR_CLASS): Update. (ISWCTYPE): Update. (if): Update. (HANDLE_MULTIBYTE): Update. (internal_function): Update. (FOLD): Update. (CHAR): Update. (UCHAR): Update. (INT): Update. (FCT): Update. (EXT): Update. (END): Update. (L_): Update. (BTOWC): Update. (STRLEN): Update. (STRCAT): Update. (MEMPCPY): Update. (MEMCHR): Update. (WIDE_CHAR_VERSION): Update. (STRUCT): Update. (FINDIDX): Update. (findidx): Update. (ALLOCA_LIMIT): Update. (SHLIB_COMPAT): Update. * import/fnmatch_loop.c (struct STRUCT): Update. (FCT): Update. (EXT): Update. (END): Update. (str): Update. (NEW_PATTERN): Update. * import/getcwd.c: Update. * import/getlogin_r.c (GetUserName): Update. * import/getprogname.c (getprogname): Update. * import/getrandom.c: New file. * import/gettimeofday.c: Remove. * import/glob.in.h (_Restrict_): Update. * import/inttypes.in.h (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (_GL_FUNCDECL_SYS): Update. (_GL_CXXALIAS_SYS): Update. * import/isblank.c: New file. * import/isnanl-nolibm.h (__has_builtin): Update. * import/libc-config.h (versioned_symbol): Update. (compat_symbol): Update. * import/limits.in.h (_GL_ALREADY_INCLUDING_LIMITS_H): Update. * import/m4/btowc.m4: New file. * import/m4/ctype.m4: New file. * import/m4/exponentl.m4: Update. * import/m4/fnmatch.m4: Update. * import/m4/getrandom.m4: New file. * import/m4/glob.m4: Update. * import/m4/gnulib-cache.m4: Update. * import/m4/gnulib-common.m4: Update. * import/m4/gnulib-comp.m4: Update. * import/m4/inttypes.m4: Update. * import/m4/isblank.m4: New file. * import/m4/isnanl.m4: Update. * import/m4/largefile.m4: Update. * import/m4/mbtowc.m4: New file. * import/m4/memmem.m4: Update. * import/m4/minmax.m4: New file. * import/m4/signal_h.m4: Update. * import/m4/stdio_h.m4: Update. * import/m4/stdlib_h.m4: Update. * import/m4/string_h.m4: Update. * import/m4/strnlen.m4: New file. * import/m4/sys_random_h.m4: New file. * import/m4/sys_socket_h.m4: Update. * import/m4/sys_stat_h.m4: Update. * import/m4/time_h.m4: Update. * import/m4/unistd_h.m4: Update. * import/m4/wchar_h.m4: Update. * import/m4/wint_t.m4: Update. * import/m4/wmemchr.m4: New file. * import/m4/wmempcpy.m4: New file. * import/math.in.h (__has_builtin): Update. * import/mbrtowc.c (FALLTHROUGH): Update. * import/mbtowc-impl.h: New file. * import/mbtowc.c: New file. * import/minmax.h: New file. * import/open.c (open): Update. * import/openat-proc.c (openat_proc_name): Update. * import/openat.c (rpl_openat): Update. (openat_needs_fchdir): Update. * import/openat.h (FCHOWNAT_INLINE): Update. (CHOWNAT_INLINE): Update. (FCHMODAT_INLINE): Update. (CHMODAT_INLINE): Update. * import/opendir.c (WIN32_FIND_DATA): Update. (GetFullPathName): Update. (FindFirstFile): Update. * import/readdir.c (FindNextFile): Update. * import/rename.c (MoveFileEx): Update. * import/rewinddir.c (FindFirstFile): Update. * import/rmdir.c: Update. * import/signal.in.h (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (_GL_FUNCDECL_SYS): Update. (_GL_CXXALIAS_SYS): Update. * import/stat-w32.c (_WIN32_WINNT): Update. (LoadLibrary): Update. (GetFinalPathNameByHandle): Update. (GetProcAddress): Update. (DWORD): Update. (GetFileInformationByHandleExFunc): Update. (GetFinalPathNameByHandleFunc): Update. * import/stat.c (WIN32_FIND_DATA): Update. (CreateFile): Update. (FindFirstFile): Update. * import/stdio.in.h (_GL_ATTRIBUTE_FORMAT): Update. (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (_GL_FUNCDECL_SYS): Update. (_GL_CXXALIAS_SYS): Update. (_GL_FUNCDECL_RPL_1): Update. (_GL_CXXALIAS_RPL_1): Update. (_GL_CXXALIAS_SYS_CAST): Update. * import/stdlib.in.h (_GL_ATTRIBUTE_PURE): Update. (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (_GL_FUNCDECL_SYS): Update. (_GL_CXXALIAS_SYS): Update. * import/string.in.h (_GL_ATTRIBUTE_PURE): Update. (_GL_WARN_ON_USE): Update. (_GL_WARN_ON_USE_CXX): Update. (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (_GL_CXXALIAS_SYS): Update. (mbstok_r): Update. * import/strnlen.c: New file. * import/sys_random.in.h: New file. * import/sys_socket.in.h (GNULIB_defined_socklen_t): Update. (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (_GL_CXXALIAS_SYS_CAST): Update. * import/sys_stat.in.h (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (_GL_FUNCDECL_SYS): Update. (_GL_CXXALIAS_SYS): Update. (lchmod): Update. (_GL_CXXALIAS_RPL_1): Update. (stat): Update. * import/tempname.c (__set_errno): Update. (__secure_getenv): Update. (__try_tempname): Update. (__getpid): Update. (__gettimeofday): Update. (RANDOM_BITS): Update. (uint64_t): Update. (RANDOM_VALUE_MAX): Update. (BASE_62_DIGITS): Update. (BASE_62_POWER): Update. (try_tempname_len): Update. (try_file): Update. (try_dir): Update. (try_nocreate): Update. (gen_tempname_len): Update. (__gen_tempname): Update. (try_tempname): Update. * import/tempname.h (gen_tempname_len): Update. (try_tempname_len): Update. * import/time.in.h (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (_GL_CXXALIAS_SYS): Update. * import/unistd.in.h (if): Update. (_GL_FUNCDECL_SYS): Update. (_GL_CXXALIAS_SYS): Update. (_GL_CXXALIASWARN): Update. (_GL_WARN_ON_USE): Update. (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. * import/verify.h: Update. * import/warn-on-use.h (_GL_WARN_ON_USE_CXX): Update. * import/wchar.in.h (_GL_ATTRIBUTE_PURE): Update. (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (_GL_FUNCDECL_SYS): Update. (_GL_CXXALIAS_SYS): Update. (_GL_CXXALIASWARN): Update. (_GL_WARN_ON_USE): Update. (_GL_CXXALIAS_SYS_CAST2): Update. (_GL_CXXALIASWARN1): Update. * import/windows-rwlock.c (CreateEvent): Update. * import/wmemchr-impl.h: New file. * import/wmemchr.c: New file. * import/wmempcpy.c: New file. * update-gnulib.sh (IMPORTED_GNULIB_MODULES): Add gettimeofday. (GNULIB_COMMIT_SHA1): Update gnulib revision.
188 lines
5.5 KiB
C
188 lines
5.5 KiB
C
/* Obtain a series of random bytes.
|
|
|
|
Copyright 2020 Free Software Foundation, Inc.
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program 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 General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <https://www.gnu.org/licenses/>. */
|
|
|
|
/* Written by Paul Eggert. */
|
|
|
|
#include <config.h>
|
|
|
|
#include <sys/random.h>
|
|
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <stdbool.h>
|
|
#include <unistd.h>
|
|
|
|
#if defined _WIN32 && ! defined __CYGWIN__
|
|
# define WIN32_LEAN_AND_MEAN
|
|
# include <windows.h>
|
|
# if HAVE_BCRYPT_H
|
|
# include <bcrypt.h>
|
|
# else
|
|
# include <ntdef.h> /* NTSTATUS */
|
|
typedef void * BCRYPT_ALG_HANDLE;
|
|
# define BCRYPT_USE_SYSTEM_PREFERRED_RNG 0x00000002
|
|
# if HAVE_LIB_BCRYPT
|
|
extern NTSTATUS WINAPI BCryptGenRandom (BCRYPT_ALG_HANDLE, UCHAR *, ULONG, ULONG);
|
|
# endif
|
|
# endif
|
|
# if !HAVE_LIB_BCRYPT
|
|
# include <wincrypt.h>
|
|
# ifndef CRYPT_VERIFY_CONTEXT
|
|
# define CRYPT_VERIFY_CONTEXT 0xF0000000
|
|
# endif
|
|
# endif
|
|
#endif
|
|
|
|
#include "minmax.h"
|
|
|
|
#if defined _WIN32 && ! defined __CYGWIN__
|
|
|
|
/* Don't assume that UNICODE is not defined. */
|
|
# undef LoadLibrary
|
|
# define LoadLibrary LoadLibraryA
|
|
# undef CryptAcquireContext
|
|
# define CryptAcquireContext CryptAcquireContextA
|
|
|
|
# if !HAVE_LIB_BCRYPT
|
|
|
|
/* Avoid warnings from gcc -Wcast-function-type. */
|
|
# define GetProcAddress \
|
|
(void *) GetProcAddress
|
|
|
|
/* BCryptGenRandom with the BCRYPT_USE_SYSTEM_PREFERRED_RNG flag works only
|
|
starting with Windows 7. */
|
|
typedef NTSTATUS (WINAPI * BCryptGenRandomFuncType) (BCRYPT_ALG_HANDLE, UCHAR *, ULONG, ULONG);
|
|
static BCryptGenRandomFuncType BCryptGenRandomFunc = NULL;
|
|
static BOOL initialized = FALSE;
|
|
|
|
static void
|
|
initialize (void)
|
|
{
|
|
HMODULE bcrypt = LoadLibrary ("bcrypt.dll");
|
|
if (bcrypt != NULL)
|
|
{
|
|
BCryptGenRandomFunc =
|
|
(BCryptGenRandomFuncType) GetProcAddress (bcrypt, "BCryptGenRandom");
|
|
}
|
|
initialized = TRUE;
|
|
}
|
|
|
|
# else
|
|
|
|
# define BCryptGenRandomFunc BCryptGenRandom
|
|
|
|
# endif
|
|
|
|
#else
|
|
/* These devices exist on all platforms except native Windows. */
|
|
|
|
/* Name of a device through which the kernel returns high quality random
|
|
numbers, from an entropy pool. When the pool is empty, the call blocks
|
|
until entropy sources have added enough bits of entropy. */
|
|
# ifndef NAME_OF_RANDOM_DEVICE
|
|
# define NAME_OF_RANDOM_DEVICE "/dev/random"
|
|
# endif
|
|
|
|
/* Name of a device through which the kernel returns random or pseudo-random
|
|
numbers. It uses an entropy pool, but, in order to avoid blocking, adds
|
|
bits generated by a pseudo-random number generator, as needed. */
|
|
# ifndef NAME_OF_NONCE_DEVICE
|
|
# define NAME_OF_NONCE_DEVICE "/dev/urandom"
|
|
# endif
|
|
|
|
#endif
|
|
|
|
/* Set BUFFER (of size LENGTH) to random bytes under the control of FLAGS.
|
|
Return the number of bytes written (> 0).
|
|
Upon error, return -1 and set errno. */
|
|
ssize_t
|
|
getrandom (void *buffer, size_t length, unsigned int flags)
|
|
#undef getrandom
|
|
{
|
|
#if defined _WIN32 && ! defined __CYGWIN__
|
|
/* BCryptGenRandom, defined in <bcrypt.h>
|
|
<https://docs.microsoft.com/en-us/windows/win32/api/bcrypt/nf-bcrypt-bcryptgenrandom>
|
|
with the BCRYPT_USE_SYSTEM_PREFERRED_RNG flag
|
|
works in Windows 7 and newer. */
|
|
static int bcrypt_not_working /* = 0 */;
|
|
if (!bcrypt_not_working)
|
|
{
|
|
# if !HAVE_LIB_BCRYPT
|
|
if (!initialized)
|
|
initialize ();
|
|
# endif
|
|
if (BCryptGenRandomFunc != NULL
|
|
&& BCryptGenRandomFunc (NULL, buffer, length,
|
|
BCRYPT_USE_SYSTEM_PREFERRED_RNG)
|
|
== 0 /*STATUS_SUCCESS*/)
|
|
return length;
|
|
bcrypt_not_working = 1;
|
|
}
|
|
# if !HAVE_LIB_BCRYPT
|
|
/* CryptGenRandom, defined in <wincrypt.h>
|
|
<https://docs.microsoft.com/en-us/windows/win32/api/wincrypt/nf-wincrypt-cryptgenrandom>
|
|
works in older releases as well, but is now deprecated.
|
|
CryptAcquireContext, defined in <wincrypt.h>
|
|
<https://docs.microsoft.com/en-us/windows/win32/api/wincrypt/nf-wincrypt-cryptacquirecontexta> */
|
|
{
|
|
static int crypt_initialized /* = 0 */;
|
|
static HCRYPTPROV provider;
|
|
if (!crypt_initialized)
|
|
{
|
|
if (CryptAcquireContext (&provider, NULL, NULL, PROV_RSA_FULL,
|
|
CRYPT_VERIFY_CONTEXT))
|
|
crypt_initialized = 1;
|
|
else
|
|
crypt_initialized = -1;
|
|
}
|
|
if (crypt_initialized >= 0)
|
|
{
|
|
if (!CryptGenRandom (provider, length, buffer))
|
|
{
|
|
errno = EIO;
|
|
return -1;
|
|
}
|
|
return length;
|
|
}
|
|
}
|
|
# endif
|
|
errno = ENOSYS;
|
|
return -1;
|
|
#elif HAVE_GETRANDOM
|
|
return getrandom (buffer, length, flags);
|
|
#else
|
|
static int randfd[2] = { -1, -1 };
|
|
bool devrandom = (flags & GRND_RANDOM) != 0;
|
|
int fd = randfd[devrandom];
|
|
|
|
if (fd < 0)
|
|
{
|
|
static char const randdevice[][MAX (sizeof NAME_OF_NONCE_DEVICE,
|
|
sizeof NAME_OF_RANDOM_DEVICE)]
|
|
= { NAME_OF_NONCE_DEVICE, NAME_OF_RANDOM_DEVICE };
|
|
int oflags = (O_RDONLY + O_CLOEXEC
|
|
+ (flags & GRND_NONBLOCK ? O_NONBLOCK : 0));
|
|
fd = open (randdevice[devrandom], oflags);
|
|
if (fd < 0)
|
|
return fd;
|
|
randfd[devrandom] = fd;
|
|
}
|
|
|
|
return read (fd, buffer, length);
|
|
#endif
|
|
}
|