X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fuuid.c;h=2aac4c7201f661ec1f168dac820b8ff5f45def85;hb=ded8fe209ff51df31ce6e7b74787584edfe00724;hp=620c039cb94318fce788ca15c320ee6c8994248f;hpb=c532bf9dd4e684bc583debc9618e3210334f8081;p=sliver-openvswitch.git

diff --git a/lib/uuid.c b/lib/uuid.c
index 620c039cb..2aac4c720 100644
--- a/lib/uuid.c
+++ b/lib/uuid.c
@@ -25,8 +25,8 @@
 #include <unistd.h>
 
 #include "aes128.h"
+#include "entropy.h"
 #include "sha1.h"
-#include "socket-util.h"
 #include "util.h"
 
 static struct aes128 key;
@@ -34,7 +34,6 @@ static uint64_t counter[2];
 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
@@ -140,6 +139,22 @@ uuid_compare_3way(const struct uuid *a, const struct uuid *b)
  * 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;
@@ -152,10 +167,10 @@ uuid_from_string(struct uuid *uuid, const char *s)
                 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;
         }
     }
 
@@ -164,27 +179,6 @@ error:
     return false;
 }
 
-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)
 {
@@ -197,7 +191,7 @@ 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");
     }
@@ -220,5 +214,5 @@ do_init(void)
     aes128_schedule(&key, sha1);
 
     /* Generate initial counter. */
-    read_urandom(counter, sizeof counter);
+    get_entropy_or_die(counter, sizeof counter);
 }