mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-02-07 06:53:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make some style fixes to prng code

Browse source
This commit is contained in:
Justine Tunney 2025-01-05 20:15:34 -08:00
parent dab6d7a345
commit 98861b23fc
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libc/calls/getrandom.c
View file

@ -114,7 +114,8 @@ static ssize_t GetDevUrandom(char *p, size_t n, unsigned f) {
ssize_t __getrandom(void *p, size_t n, unsigned f) { ssize_t __getrandom(void *p, size_t n, unsigned f) {
ssize_t rc; ssize_t rc;
if (IsWindows()) { if (IsWindows()) {
rc = ProcessPrng(p, n) ? n : __winerr(); ProcessPrng(p, n); // never fails
rc = n;
} else if (have_getrandom) { } else if (have_getrandom) {
if (IsXnu() || IsOpenbsd()) { if (IsXnu() || IsOpenbsd()) {
rc = GetRandomBsd(p, n, GetRandomEntropy); rc = GetRandomBsd(p, n, GetRandomEntropy);
@ -184,9 +185,7 @@ ssize_t __getrandom(void *p, size_t n, unsigned f) {
* @raise EFAULT if the `n` bytes at `p` aren't valid memory * @raise EFAULT if the `n` bytes at `p` aren't valid memory
* @raise EINTR if we needed to block and a signal was delivered instead * @raise EINTR if we needed to block and a signal was delivered instead
* @cancelationpoint * @cancelationpoint
* @asyncsignalsafe
* @restartable * @restartable
* @vforksafe
*/ */
ssize_t getrandom(void *p, size_t n, unsigned f) { ssize_t getrandom(void *p, size_t n, unsigned f) {
ssize_t rc; ssize_t rc;

6
libc/calls/read-nt.c
View file

@ -997,8 +997,10 @@ textwindows ssize_t ReadBuffer(int fd, void *data, size_t size, int64_t offset,
if (f->kind == kFdDevNull) if (f->kind == kFdDevNull)
return 0; return 0;
if (f->kind == kFdDevRandom) if (f->kind == kFdDevRandom) {
return ProcessPrng(data, size) ? size : __winerr(); ProcessPrng(data, size);
return size;
}
if (f->kind == kFdConsole) if (f->kind == kFdConsole)
return ReadFromConsole(f, data, size, waitmask); return ReadFromConsole(f, data, size, waitmask);

3
libc/stdio/getentropy.c
View file

@ -21,6 +21,7 @@
#include "libc/dce.h" #include "libc/dce.h"
#include "libc/errno.h" #include "libc/errno.h"
#include "libc/intrin/strace.h" #include "libc/intrin/strace.h"
#include "libc/runtime/syslib.internal.h"
#include "libc/sysv/errfuns.h" #include "libc/sysv/errfuns.h"
int sys_getentropy(void *, size_t) asm("sys_getrandom"); int sys_getentropy(void *, size_t) asm("sys_getrandom");
@ -39,6 +40,8 @@ int getentropy(void *p, size_t n) {
rc = eio(); rc = eio();
} else if ((!p && n)) { } else if ((!p && n)) {
rc = efault(); rc = efault();
} else if (IsXnuSilicon()) {
rc = __syslib->__getentropy(p, n);
} else if (IsXnu() || IsOpenbsd()) { } else if (IsXnu() || IsOpenbsd()) {
rc = sys_getentropy(p, n); rc = sys_getentropy(p, n);
} else { } else {