add BRandom2

CMakeLists.txt

@@ -211,6 +211,7 @@ set(BUILDING_BKIO 0)
 set(BUILDING_PREDICATE 0)
 set(BUILDING_UDEVMONITOR 0)
 set(BUILDING_THREADWORK 0)
+set(BUILDING_RANDOM 0)
 
 # internal libraries
 add_subdirectory(base)
@@ -242,10 +243,12 @@ if (BUILD_NCD)
     set(BUILDING_DHCPCLIENT 1)
     set(BUILDING_ARPPROBE 1)
     set(BUILDING_UDEVMONITOR 1)
+    set(BUILDING_RANDOM 1)
     add_subdirectory(stringmap)
     add_subdirectory(udevmonitor)
     add_subdirectory(dhcpclient)
     add_subdirectory(arpprobe)
+    add_subdirectory(random)
 endif ()
 if (BUILD_TUN2SOCKS)
     add_subdirectory(socksclient)

examples/CMakeLists.txt

@@ -75,3 +75,8 @@ add_executable(cstringtrie_test cstringtrie_test.c)
 if (NOT WIN32)
     add_executable(ipaddr6_test ipaddr6_test.c)
 endif ()
+
+if (BUILDING_RANDOM)
+    add_executable(brandom2_test brandom2_test.c)
+    target_link_libraries(brandom2_test badvpn_random)
+endif ()

examples/brandom2_test.c

@@ -0,0 +1,65 @@
+/**
+ * @file brandom2_test.c
+ * @author Ambroz Bizjak <ambrop7@gmail.com>
+ * 
+ * @section LICENSE
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the author nor the
+ *    names of its contributors may be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdio.h>
+#include <inttypes.h>
+
+#include <misc/debug.h>
+#include <random/BRandom2.h>
+
+#define NUM_NUMBERS 10
+
+static BRandom2 brandom;
+
+int main (int argc, char *argv[])
+{
+    int ret = 1;
+    
+    if (!BRandom2_Init(&brandom, 0)) {
+        DEBUG("BRandom2_Init failed");
+        goto fail0;
+    }
+    
+    uint32_t numbers[NUM_NUMBERS];
+    if (!BRandom2_GenBytes(&brandom, numbers, sizeof(numbers))) {
+        DEBUG("BRandom2_GenBytes failed");
+        goto fail1;
+    }
+    
+    for (int i = 0; i < NUM_NUMBERS; i++) {
+        printf("%"PRIu32"\n", numbers[i]);
+    }
+    
+    ret = 0;
+    
+fail1:
+    BRandom2_Free(&brandom);
+fail0:
+    return ret;
+}

random/BRandom2.c

@@ -0,0 +1,90 @@
+/**
+ * @file BRandom2.c
+ * @author Ambroz Bizjak <ambrop7@gmail.com>
+ * 
+ * @section LICENSE
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the author nor the
+ *    names of its contributors may be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#include "BRandom2.h"
+
+static int do_init (BRandom2 *o)
+{
+    if (o->initialized) {
+        return 1;
+    }
+    
+    o->urandom_fd = open("/dev/urandom", O_RDONLY);
+    if (o->urandom_fd < 0) {
+        return 0;
+    }
+    
+    o->initialized = 1;
+    
+    return 1;
+}
+
+int BRandom2_Init (BRandom2 *o, int flags)
+{
+    ASSERT((flags & ~(BRANDOM2_INIT_LAZY)) == 0)
+    
+    o->initialized = 0;
+    
+    if (!(flags & BRANDOM2_INIT_LAZY) && !do_init(o)) {
+        return 0;
+    }
+    
+    DebugObject_Init(&o->d_obj);
+    return 1;
+}
+
+void BRandom2_Free (BRandom2 *o)
+{
+    DebugObject_Free(&o->d_obj);
+    
+    if (o->initialized) {
+        close(o->urandom_fd);
+    }
+}
+
+int BRandom2_GenBytes (BRandom2 *o, void *out, size_t len)
+{
+    DebugObject_Access(&o->d_obj);
+    
+    if (!do_init(o)) {
+        return 0;
+    }
+    
+    ssize_t res = read(o->urandom_fd, out, len);
+    if (res < 0 || res != len) {
+        return 0;
+    }
+    
+    return 1;
+}

random/BRandom2.h

@@ -0,0 +1,50 @@
+/**
+ * @file BRandom2.h
+ * @author Ambroz Bizjak <ambrop7@gmail.com>
+ * 
+ * @section LICENSE
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the author nor the
+ *    names of its contributors may be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef BADVPN_RANDOM2_H
+#define BADVPN_RANDOM2_H
+
+#include <stddef.h>
+
+#include <misc/debug.h>
+#include <base/DebugObject.h>
+
+#define BRANDOM2_INIT_LAZY (1 << 0)
+
+typedef struct {
+    int initialized;
+    int urandom_fd;
+    DebugObject d_obj;
+} BRandom2;
+
+int BRandom2_Init (BRandom2 *o, int flags) WARN_UNUSED;
+void BRandom2_Free (BRandom2 *o);
+int BRandom2_GenBytes (BRandom2 *o, void *out, size_t len) WARN_UNUSED;
+
+#endif

random/CMakeLists.txt

@@ -0,0 +1,4 @@
+add_library(badvpn_random
+    BRandom2.c
+)
+target_link_libraries(badvpn_random base)