From 0f0e240cb8625d832e760ef32ed772e21c316905 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 19 Feb 2014 17:50:15 +0100 Subject: [PATCH] sd-id128: use new dev_urandom() call --- src/libsystemd/sd-id128/sd-id128.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/libsystemd/sd-id128/sd-id128.c b/src/libsystemd/sd-id128/sd-id128.c index 9ee40ab91..a1e44e6d1 100644 --- a/src/libsystemd/sd-id128/sd-id128.c +++ b/src/libsystemd/sd-id128/sd-id128.c @@ -208,22 +208,14 @@ _public_ int sd_id128_get_boot(sd_id128_t *ret) { } _public_ int sd_id128_randomize(sd_id128_t *ret) { - _cleanup_close_ int fd = -1; sd_id128_t t; - ssize_t k; + int r; assert_return(ret, -EINVAL); - fd = open("/dev/urandom", O_RDONLY|O_CLOEXEC|O_NOCTTY); - if (fd < 0) - return -errno; - - k = loop_read(fd, &t, 16, false); - if (k < 0) - return (int) k; - - if (k != 16) - return -EIO; + r = dev_urandom(&t, sizeof(t)); + if (r < 0) + return r; /* Turn this into a valid v4 UUID, to be nice. Note that we * only guarantee this for newly generated UUIDs, not for -- 2.30.2