Merge branch 'patch-3' of git://github.com/sdgathman/cjdns into crashey

cjdelisle · Aug 6, 2019 · 2dfc2a5 · 2dfc2a5
2 parents 45c9d28 + bc524d7
commit 2dfc2a5
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/crypto/random/seed/LinuxRandomUuidSysctlRandomSeed.c b/crypto/random/seed/LinuxRandomUuidSysctlRandomSeed.c
@@ -20,6 +20,7 @@
 
 #include <unistd.h>
 #include <sys/syscall.h>
+#ifndef SYS_getrandom
 #include <sys/sysctl.h>
 
 static int getUUID(uint64_t output[2])
@@ -35,6 +36,7 @@ static int getUUID(uint64_t output[2])
     }
     return 0;
 }
+#endif
 
 static int get(struct RandomSeed* randomSeed, uint64_t output[8])
 {
@@ -48,11 +50,13 @@ static int get(struct RandomSeed* randomSeed, uint64_t output[8])
     if (ret == 64 && !Bits_isZero(output, 64)) {
         return 0;
     }
-#endif
+    return -1;
+#else
     if (getUUID(output) || getUUID(output+2) || getUUID(output+4) || getUUID(output+6)) {
         return -1;
     }
     return 0;
+#endif
 }
 
 struct RandomSeed* LinuxRandomUuidSysctlRandomSeed_new(struct Allocator* alloc)