Hi, Another patch attached. Hopefully this one addresses all the problems.
Thanks again. -- Andrew Eggenberger
>From 533413ba62d8be167b09f508f23d7130f25688f2 Mon Sep 17 00:00:00 2001 From: Andrew Eggenberger <andrew.eggenber...@gmail.com> Date: Tue, 29 Oct 2019 23:19:32 -0500 Subject: [PATCH] add getrandom and getentropy implementations squash! add getrandom and getentropy implementations squash! add getrandom and getentropy implementations --- sysdeps/mach/hurd/getentropy.c | 65 ++++++++++++++++++++++++++++++++++ sysdeps/mach/hurd/getrandom.c | 43 ++++++++++++++++++++++ 2 files changed, 108 insertions(+) create mode 100644 sysdeps/mach/hurd/getentropy.c create mode 100644 sysdeps/mach/hurd/getrandom.c diff --git a/sysdeps/mach/hurd/getentropy.c b/sysdeps/mach/hurd/getentropy.c new file mode 100644 index 0000000000..ae2e6440da --- /dev/null +++ b/sysdeps/mach/hurd/getentropy.c @@ -0,0 +1,65 @@ +/* Implementation of getentropy based on getrandom. + Copyright (C) 2016-2018 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + 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 <sys/random.h> +#include <assert.h> +#include <errno.h> +#include <unistd.h> + +/* Write LENGTH bytes of randomness starting at BUFFER. Return 0 on + success and -1 on failure. */ +int +getentropy (void *buffer, size_t length) +{ + /* The interface is documented to return EIO for buffer lengths + longer than 256 bytes. */ + if (length > 256) + { + __set_errno (EIO); + return -1; + } + + /* Try to fill the buffer completely. Even with the 256 byte limit + above, we might still receive an EINTR error (when blocking + during boot). */ + void *end = buffer + length; + while (buffer < end) + { + /* NB: No cancellation point. */ + ssize_t bytes = getrandom(buffer, end - buffer, 0); + if (bytes < 0) + { + if (errno == EINTR) + /* Try again if interrupted by a signal. */ + continue; + else + return -1; + } + if (bytes == 0) + { + /* No more bytes available. This should not happen under + normal circumstances. */ + __set_errno (EIO); + return -1; + } + /* Try again in case of a short read. */ + buffer += bytes; + } + return 0; +} + diff --git a/sysdeps/mach/hurd/getrandom.c b/sysdeps/mach/hurd/getrandom.c new file mode 100644 index 0000000000..dc75acc29e --- /dev/null +++ b/sysdeps/mach/hurd/getrandom.c @@ -0,0 +1,43 @@ +/* Hurdish implementation of getrandom + Copyright (C) 2016-2018 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + 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 <sys/random.h> +#include <fcntl.h> +#include <unistd.h> +#include <not-cancel.h> + +/* Write up to LENGTH bytes of randomness starting at BUFFER. + Return the number of bytes written, or -1 on error. */ +ssize_t +getrandom (void *buffer, size_t length, unsigned int flags) +{ + const char *random_source = "/dev/urandom"; + size_t amount_read; + int fd, err; + + if (flags & GRND_RANDOM) + random_source = "/dev/random"; + + fd = __open_nocancel(random_source, O_RDONLY | O_CLOEXEC); + if (fd == -1) + return -1; + + amount_read = __read_nocancel(fd, buffer, length); + err = __close_nocancel(fd); + return amount_read; +} -- 2.23.0
