PlaneteCasio
/
libc
1
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

Move getentropy/getrandom into own file 

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2017-01-19 20:58:06 +01:00
parent e6e66224f3
commit bbf6993a2d
3 changed files with 71 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
winsup/cygwin/Makefile.in
View File

@ -307,6 +307,7 @@ DLL_OFILES:= \
fork.o \
fts.o \
ftw.o \
getentropy.o \
getopt.o \
glob.o \
glob_pattern_p.o \

70
winsup/cygwin/libc/getentropy.cc Normal file
View File

@ -0,0 +1,70 @@
/* getentropy.cc: getentropy/getrandmom functions
This file is part of Cygwin.
This software is a copyrighted work licensed under the terms of the
Cygwin license. Please consult the file "CYGWIN_LICENSE" for
details. */
#include "winsup.h"
#include <ntsecapi.h>
#include <sys/param.h>
#include <sys/random.h>
#include "cygtls.h"
#include "ntdll.h"
extern "C" int
getentropy (void *ptr, size_t len)
{
/* Per BSD man page: The maximum buffer size permitted is 256 bytes.
If buflen exceeds this, an error of EIO will be indicated. */
if (len > 256)
{
debug_printf ("len (%U) > 256", len);
set_errno (EIO);
return -1;
}
__try
{
if (!RtlGenRandom (ptr, len))
{
debug_printf ("RtlGenRandom() = FALSE");
set_errno (EIO);
return -1;
}
}
__except (EFAULT)
{
return -1;
}
__endtry
return 0;
}
extern "C" ssize_t
getrandom (void *ptr, size_t len, unsigned int flags)
{
if (flags & ~(GRND_NONBLOCK | GRND_RANDOM))
{
debug_printf ("invalid flags: %y", flags);
set_errno (EINVAL);
return -1;
}
/* Max. bytes returned by Linux call. */
len = MAX (len, (flags & GRND_RANDOM) ? 512 : 33554431);
__try
{
if (!RtlGenRandom (ptr, len))
{
debug_printf ("RtlGenRandom() = FALSE");
set_errno (EIO);
return -1;
}
}
__except (EFAULT)
{
return -1;
}
__endtry
return len;
}

57
winsup/cygwin/miscfuncs.cc
View File

@ -14,7 +14,6 @@ details. */
#include <alloca.h>
#include <limits.h>
#include <sys/param.h>
#include <sys/random.h>
#include <wchar.h>
#include "cygtls.h"
#include "ntdll.h"
@ -235,62 +234,6 @@ check_iovec (const struct iovec *iov, int iovcnt, bool forwrite)
return -1;
}
extern "C" int
getentropy (void *ptr, size_t len)
{
/* Per BSD man page: The maximum buffer size permitted is 256 bytes.
If buflen exceeds this, an error of EIO will be indicated. */
if (len > 256)
{
debug_printf ("len (%U) > 256", len);
set_errno (EIO);
return -1;
}
__try
{
if (!RtlGenRandom (ptr, len))
{
debug_printf ("RtlGenRandom() = FALSE");
set_errno (EIO);
return -1;
}
}
__except (EFAULT)
{
return -1;
}
__endtry
return 0;
}
extern "C" ssize_t
getrandom (void *ptr, size_t len, unsigned int flags)
{
if (flags & ~(GRND_NONBLOCK | GRND_RANDOM))
{
debug_printf ("invalid flags: %y", flags);
set_errno (EINVAL);
return -1;
}
/* Max. bytes returned by Linux call. */
len = MAX (len, (flags & GRND_RANDOM) ? 512 : 33554431);
__try
{
if (!RtlGenRandom (ptr, len))
{
debug_printf ("RtlGenRandom() = FALSE");
set_errno (EIO);
return -1;
}
}
__except (EFAULT)
{
return -1;
}
__endtry
return len;
}
/* Try hard to schedule another thread.
Remember not to call this in a lock condition or you'll potentially
suffer starvation. */