#include <unistd.h>
#include "aes128.h"
+#include "entropy.h"
#include "sha1.h"
-#include "socket-util.h"
#include "util.h"
static struct aes128 key;
BUILD_ASSERT_DECL(sizeof counter == 16);
static void do_init(void);
-static void read_urandom(void *buffer, size_t n);
/*
* Initialize the UUID module. Aborts the program with an error message if
* be set to all-zero-bits. */
bool
uuid_from_string(struct uuid *uuid, const char *s)
+{
+ if (!uuid_from_string_prefix(uuid, s)) {
+ return false;
+ } else if (s[UUID_LEN] != '\0') {
+ uuid_zero(uuid);
+ return false;
+ } else {
+ return true;
+ }
+}
+
+/* Same as uuid_from_string() but s[UUID_LEN] is not required to be a null byte
+ * to succeed; that is, 's' need only begin with UUID syntax, not consist
+ * entirely of it. */
+bool
+uuid_from_string_prefix(struct uuid *uuid, const char *s)
{
static const char template[] = "00000000-1111-1111-2222-222233333333";
const char *t;
goto error;
}
*part = (*part << 4) + hexit_value(*s);
- } else if (*t != *s) {
- goto error;
} else if (*t == 0) {
return true;
+ } else if (*t != *s) {
+ goto error;
}
}
return false;
}
\f
-static void
-read_urandom(void *buffer, size_t n)
-{
- static const char urandom[] = "/dev/urandom";
- size_t bytes_read;
- int error;
- int fd;
-
- fd = open(urandom, O_RDONLY);
- if (fd < 0) {
- ovs_fatal(errno, "%s: open failed", urandom);
- }
- error = read_fully(fd, buffer, n, &bytes_read);
- if (error == EOF) {
- ovs_fatal(0, "%s: unexpected end of file", urandom);
- } else if (error) {
- ovs_fatal(error, "%s: read error", urandom);
- }
- close(fd);
-}
-
static void
do_init(void)
{
gid_t gid;
/* Get seed data. */
- read_urandom(random_seed, sizeof random_seed);
+ get_entropy_or_die(random_seed, sizeof random_seed);
if (gettimeofday(&now, NULL)) {
ovs_fatal(errno, "gettimeofday failed");
}
aes128_schedule(&key, sha1);
/* Generate initial counter. */
- read_urandom(counter, sizeof counter);
+ get_entropy_or_die(counter, sizeof counter);
}