random-util: allow RDRAND to be used in 32-bit x86 binaries

Rename rdrand64 to rdrand, and switch from uint64_t to unsigned long.
This produces code that will compile/assemble on both x86-64 and x86-32.

This could be useful when running a 32-bit copy of systemd on a modern
Intel processor.

RDRAND is inherently arch-specific, so relying on the compiler-defined
'long' type seems reasonable.

diff --git a/src/basic/random-util.c b/src/basic/random-util.c
index c17c09765b0093a37af3f91346f396064384a100..4a36ad51195aa9e1b54f489c63fd939e15b12561 100644 (file)
--- a/src/basic/random-util.c
+++ b/src/basic/random-util.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifdef __x86_64__
+#if defined(__i386__) || defined(__x86_64__)
 #include <cpuid.h>
 #endif
 
@@ -34,9 +34,9 @@
 #include <sanitizer/msan_interface.h>
 #endif
 
-int rdrand64(uint64_t *ret) {
+int rdrand(unsigned long *ret) {
 
-#ifdef __x86_64__
+#if defined(__i386__) || defined(__x86_64__)
         static int have_rdrand = -1;
         unsigned char err;
 
@@ -95,10 +95,10 @@ int genuine_random_bytes(void *p, size_t n, RandomFlags flags) {
                  * allows us too, since this way we won't drain the kernel randomness pool if we don't need it, as the
                  * pool's entropy is scarce. */
                 for (;;) {
-                        uint64_t u;
+                        unsigned long u;
                         size_t m;
 
-                        if (rdrand64(&u) < 0) {
+                        if (rdrand(&u) < 0) {
                                 if (got_some && FLAGS_SET(flags, RANDOM_EXTEND_WITH_PSEUDO)) {
                                         /* Fill in the remaining bytes using pseudo-random values */
                                         pseudo_random_bytes(p, n);
@@ -198,7 +198,7 @@ void initialize_srand(void) {
 #if HAVE_SYS_AUXV_H
         const void *auxv;
 #endif
-        uint64_t k;
+        unsigned long k;
 
         if (srand_called)
                 return;
@@ -219,7 +219,7 @@ void initialize_srand(void) {
         x ^= (unsigned) now(CLOCK_REALTIME);
         x ^= (unsigned) gettid();
 
-        if (rdrand64(&k) >= 0)
+        if (rdrand(&k) >= 0)
                 x ^= (unsigned) k;
 
         srand(x);

diff --git a/src/basic/random-util.h b/src/basic/random-util.h
index 7a960cf9e76b1b192c026c8a05923d6c11435fcc..3e8c288d3d00f38c077bb205b6218d93f33cecb6 100644 (file)
--- a/src/basic/random-util.h
+++ b/src/basic/random-util.h
@@ -30,4 +30,4 @@ static inline uint32_t random_u32(void) {
         return u;
 }
 
-int rdrand64(uint64_t *ret);
+int rdrand(unsigned long *ret);

diff --git a/src/test/test-random-util.c b/src/test/test-random-util.c
index a59c6374b21fe370269a0c9758454f512a8e1c3d..94c431f7e6084ea88c649efada378ec91852c145 100644 (file)
--- a/src/test/test-random-util.c
+++ b/src/test/test-random-util.c
@@ -35,19 +35,19 @@ static void test_pseudo_random_bytes(void) {
         }
 }
 
-static void test_rdrand64(void) {
+static void test_rdrand(void) {
         int r, i;
 
         for (i = 0; i < 10; i++) {
-                uint64_t x = 0;
+                unsigned long x = 0;
 
-                r = rdrand64(&x);
+                r = rdrand(&x);
                 if (r < 0) {
                         log_error_errno(r, "RDRAND failed: %m");
                         return;
                 }
 
-                printf("%" PRIx64 "\n", x);
+                printf("%lx\n", x);
         }
 }
 
@@ -61,7 +61,7 @@ int main(int argc, char **argv) {
 
         test_pseudo_random_bytes();
 
-        test_rdrand64();
+        test_rdrand();
 
         return 0;
 }