picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

shared: add random-util.[ch]

This commit is contained in:
Ronny Chevalier 2015-04-10 22:27:10 +02:00
parent 0b452006de
commit 3df3e884ae
24 changed files with 188 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -901,6 +901,8 @@ libsystemd_shared_la_SOURCES = \
src/shared/memfd-util.h \
src/shared/process-util.c \
src/shared/process-util.h \
src/shared/random-util.c \
src/shared/random-util.h \
src/shared/uid-range.c \
src/shared/uid-range.h \
src/shared/nss-util.h \

1
src/firstboot/firstboot.c
View File

@ -32,6 +32,7 @@
#include "mkdir.h"
#include "time-util.h"
#include "path-util.h"
#include "random-util.h"
#include "locale-util.h"
#include "ask-password-api.h"

1
src/journal/journal-file.c
View File

@ -34,6 +34,7 @@
#include "journal-authenticate.h"
#include "lookup3.h"
#include "compress.h"
#include "random-util.h"
#define DEFAULT_DATA_HASH_TABLE_SIZE (2047ULL*sizeof(HashItem))
#define DEFAULT_FIELD_HASH_TABLE_SIZE (333ULL*sizeof(HashItem))

1
src/journal/journald-rate-limit.c
View File

@ -26,6 +26,7 @@
#include "list.h"
#include "util.h"
#include "hashmap.h"
#include "random-util.h"
#define POOLS_MAX 5
#define BUCKETS_MAX 127

1
src/journal/test-compress.c
View File

@ -20,6 +20,7 @@
#include "compress.h"
#include "util.h"
#include "macro.h"
#include "random-util.h"
#ifdef HAVE_XZ
# define XZ_OK 0

1
src/libsystemd-network/sd-dhcp-client.c
View File

@ -28,6 +28,7 @@
#include "util.h"
#include "refcnt.h"
#include "random-util.h"
#include "async.h"
#include "dhcp-protocol.h"

1
src/libsystemd-network/sd-dhcp6-client.c
View File

@ -28,6 +28,7 @@
#include "udev-util.h"
#include "util.h"
#include "refcnt.h"
#include "random-util.h"
#include "network-internal.h"
#include "sd-dhcp6-client.h"

1
src/libsystemd-network/sd-ipv4ll.c
View File

@ -27,6 +27,7 @@
#include "siphash24.h"
#include "list.h"
#include "refcnt.h"
#include "random-util.h"
#include "ipv4ll-internal.h"
#include "sd-ipv4ll.h"

1
src/libsystemd-network/sd-pppoe.c
View File

@ -33,6 +33,7 @@
#include "event-util.h"
#include "util.h"
#include "random-util.h"
#include "socket-util.h"
#include "async.h"
#include "refcnt.h"

2
src/libsystemd-terminal/modeset.c
View File

@ -40,11 +40,13 @@
#include <systemd/sd-login.h>
#include <termios.h>
#include <unistd.h>
#include "build.h"
#include "grdev.h"
#include "macro.h"
#include "sysview.h"
#include "util.h"
#include "random-util.h"
typedef struct Modeset Modeset;

1
src/libsystemd/sd-id128/sd-id128.c
View File

@ -26,6 +26,7 @@
#include "util.h"
#include "macro.h"
#include "sd-id128.h"
#include "random-util.h"
_public_ char *sd_id128_to_string(sd_id128_t id, char s[33]) {
unsigned n;

1
src/nspawn/nspawn.c
View File

@ -52,6 +52,7 @@
#include <blkid/blkid.h>
#endif
#include "random-util.h"
#include "sd-daemon.h"
#include "sd-bus.h"
#include "sd-id128.h"

1
src/resolve/resolved-dns-scope.c
View File

@ -27,6 +27,7 @@
#include "af-list.h"
#include "resolved-dns-domain.h"
#include "resolved-dns-scope.h"
#include "random-util.h"
#define MULTICAST_RATELIMIT_INTERVAL_USEC (1*USEC_PER_SEC)
#define MULTICAST_RATELIMIT_BURST 1000

1
src/resolve/resolved-dns-transaction.c
View File

@ -22,6 +22,7 @@
#include "af-list.h"
#include "resolved-dns-transaction.h"
#include "random-util.h"
DnsTransaction* dns_transaction_free(DnsTransaction *t) {
DnsQuery *q;

1
src/resolve/resolved-manager.c
View File

@ -31,6 +31,7 @@
#include "utf8.h"
#include "fileio-label.h"
#include "ordered-set.h"
#include "random-util.h"
#include "resolved-dns-domain.h"
#include "resolved-conf.h"

1
src/shared/ask-password-api.c
View File

@ -35,6 +35,7 @@
#include "formats-util.h"
#include "mkdir.h"
#include "strv.h"
#include "random-util.h"
#include "ask-password-api.h"

1
src/shared/hashmap.c
View File

@ -30,6 +30,7 @@
#include "siphash24.h"
#include "strv.h"
#include "mempool.h"
#include "random-util.h"
#ifdef ENABLE_DEBUG_HASHMAP
#include "list.h"

127
src/shared/random-util.c Normal file
View File

@ -0,0 +1,127 @@
/***
This file is part of systemd.
Copyright 2010 Lennart Poettering
systemd 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.
systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#include <stdint.h>
#include <errno.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <time.h>
#include <sys/auxv.h>
#include <linux/random.h>
#include "random-util.h"
#include "time-util.h"
#include "missing.h"
#include "util.h"
int dev_urandom(void *p, size_t n) {
static int have_syscall = -1;
_cleanup_close_ int fd = -1;
int r;
/* Gathers some randomness from the kernel. This call will
* never block, and will always return some data from the
* kernel, regardless if the random pool is fully initialized
* or not. It thus makes no guarantee for the quality of the
* returned entropy, but is good enough for or usual usecases
* of seeding the hash functions for hashtable */
/* Use the getrandom() syscall unless we know we don't have
* it, or when the requested size is too large for it. */
if (have_syscall != 0 || (size_t) (int) n != n) {
r = getrandom(p, n, GRND_NONBLOCK);
if (r == (int) n) {
have_syscall = true;
return 0;
}
if (r < 0) {
if (errno == ENOSYS)
/* we lack the syscall, continue with
* reading from /dev/urandom */
have_syscall = false;
else if (errno == EAGAIN)
/* not enough entropy for now. Let's
* remember to use the syscall the
* next time, again, but also read
* from /dev/urandom for now, which
* doesn't care about the current
* amount of entropy. */
have_syscall = true;
else
return -errno;
} else
/* too short read? */
return -ENODATA;
}
fd = open("/dev/urandom", O_RDONLY|O_CLOEXEC|O_NOCTTY);
if (fd < 0)
return errno == ENOENT ? -ENOSYS : -errno;
return loop_read_exact(fd, p, n, true);
}
void initialize_srand(void) {
static bool srand_called = false;
unsigned x;
#ifdef HAVE_SYS_AUXV_H
void *auxv;
#endif
if (srand_called)
return;
x = 0;
#ifdef HAVE_SYS_AUXV_H
/* The kernel provides us with a bit of entropy in auxv, so
* let's try to make use of that to seed the pseudo-random
* generator. It's better than nothing... */
auxv = (void*) getauxval(AT_RANDOM);
if (auxv)
x ^= *(unsigned*) auxv;
#endif
x ^= (unsigned) now(CLOCK_REALTIME);
x ^= (unsigned) gettid();
srand(x);
srand_called = true;
}
void random_bytes(void *p, size_t n) {
uint8_t *q;
int r;
r = dev_urandom(p, n);
if (r >= 0)
return;
/* If some idiot made /dev/urandom unavailable to us, he'll
* get a PRNG instead. */
initialize_srand();
for (q = p; q < (uint8_t*) p + n; q ++)
*q = rand();
}

38
src/shared/random-util.h Normal file
View File

@ -0,0 +1,38 @@
#pragma once
/***
This file is part of systemd.
Copyright 2010 Lennart Poettering
systemd 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.
systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#include <stdint.h>
int dev_urandom(void *p, size_t n);
void random_bytes(void *p, size_t n);
void initialize_srand(void);
static inline uint64_t random_u64(void) {
uint64_t u;
random_bytes(&u, sizeof(u));
return u;
}
static inline uint32_t random_u32(void) {
uint32_t u;
random_bytes(&u, sizeof(u));
return u;
}

96
src/shared/util.c
View File

@ -94,6 +94,7 @@
#include "sparse-endian.h"
#include "formats-util.h"
#include "process-util.h"
#include "random-util.h"
/* Put this test here for a lack of better place */
assert_cc(EAGAIN == EWOULDBLOCK);
@ -2387,101 +2388,6 @@ char* dirname_malloc(const char *path) {
return dir;
}
int dev_urandom(void *p, size_t n) {
static int have_syscall = -1;
_cleanup_close_ int fd = -1;
int r;
/* Gathers some randomness from the kernel. This call will
* never block, and will always return some data from the
* kernel, regardless if the random pool is fully initialized
* or not. It thus makes no guarantee for the quality of the
* returned entropy, but is good enough for or usual usecases
* of seeding the hash functions for hashtable */
/* Use the getrandom() syscall unless we know we don't have
* it, or when the requested size is too large for it. */
if (have_syscall != 0 || (size_t) (int) n != n) {
r = getrandom(p, n, GRND_NONBLOCK);
if (r == (int) n) {
have_syscall = true;
return 0;
}
if (r < 0) {
if (errno == ENOSYS)
/* we lack the syscall, continue with
* reading from /dev/urandom */
have_syscall = false;
else if (errno == EAGAIN)
/* not enough entropy for now. Let's
* remember to use the syscall the
* next time, again, but also read
* from /dev/urandom for now, which
* doesn't care about the current
* amount of entropy. */
have_syscall = true;
else
return -errno;
} else
/* too short read? */
return -ENODATA;
}
fd = open("/dev/urandom", O_RDONLY|O_CLOEXEC|O_NOCTTY);
if (fd < 0)
return errno == ENOENT ? -ENOSYS : -errno;
return loop_read_exact(fd, p, n, true);
}
void initialize_srand(void) {
static bool srand_called = false;
unsigned x;
#ifdef HAVE_SYS_AUXV_H
void *auxv;
#endif
if (srand_called)
return;
x = 0;
#ifdef HAVE_SYS_AUXV_H
/* The kernel provides us with a bit of entropy in auxv, so
* let's try to make use of that to seed the pseudo-random
* generator. It's better than nothing... */
auxv = (void*) getauxval(AT_RANDOM);
if (auxv)
x ^= *(unsigned*) auxv;
#endif
x ^= (unsigned) now(CLOCK_REALTIME);
x ^= (unsigned) gettid();
srand(x);
srand_called = true;
}
void random_bytes(void *p, size_t n) {
uint8_t *q;
int r;
r = dev_urandom(p, n);
if (r >= 0)
return;
/* If some idiot made /dev/urandom unavailable to us, he'll
* get a PRNG instead. */
initialize_srand();
for (q = p; q < (uint8_t*) p + n; q ++)
*q = rand();
}
void rename_process(const char name[8]) {
assert(name);

16
src/shared/util.h
View File

@ -283,22 +283,6 @@ int make_stdio(int fd);
int make_null_stdio(void);
int make_console_stdio(void);
int dev_urandom(void *p, size_t n);
void random_bytes(void *p, size_t n);
void initialize_srand(void);
static inline uint64_t random_u64(void) {
uint64_t u;
random_bytes(&u, sizeof(u));
return u;
}
static inline uint32_t random_u32(void) {
uint32_t u;
random_bytes(&u, sizeof(u));
return u;
}
/* For basic lookup tables with strictly enumerated entries */
#define _DEFINE_STRING_TABLE_LOOKUP_TO_STRING(name,type,scope) \
scope const char *name##_to_string(type i) { \

1
src/udev/cdrom_id/cdrom_id.c
View File

@ -36,6 +36,7 @@
#include "libudev.h"
#include "libudev-private.h"
#include "random-util.h"
/* device info */
static unsigned int cd_cd_rom;

1
src/udev/net/link-config.c
View File

@ -37,6 +37,7 @@
#include "conf-files.h"
#include "rtnl-util.h"
#include "network-internal.h"
#include "random-util.h"
struct link_config_ctx {
LIST_HEAD(link_config, links);

1
src/udev/scsi_id/scsi_serial.c
View File

@ -37,6 +37,7 @@
#include "libudev-private.h"
#include "scsi.h"
#include "scsi_id.h"
#include "random-util.h"
/*
* A priority based list of id, naa, and binary/ascii for the identifier