coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-18 14:12:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

util/nvmutil: re-add arc4random

Browse Source 
Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-03-14 18:52:53 +00:00
parent 94632f3394
commit 8ccdde57e1
1 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/nvmutil/nvmutil.c
+32
View File
@@ -15,6 +15,13 @@
* -Os -Wall -Wextra -Werror -pedantic -std=c90 * -Os -Wall -Wextra -Werror -pedantic -std=c90
*/ */
#if defined(__OpenBSD__) || defined(__FreeBSD__) || \
defined(__NetBSD__) || defined(__APPLE__)
#ifndef HAVE_ARC4RANDOM_BUF
#define HAVE_ARC4RANDOM_BUF 1
#endif
#endif
/* /*
* I/O config (build-time) * I/O config (build-time)
* *
@@ -329,7 +336,10 @@ static void set_mac_nib(size_t mac_str_pos,
size_t mac_byte_pos, size_t mac_nib_pos); size_t mac_byte_pos, size_t mac_nib_pos);
static ushort hextonum(char ch_s); static ushort hextonum(char ch_s);
static ushort rhex(void); static ushort rhex(void);
#if !defined(HAVE_ARC4RANDOM_BUF) || \
(HAVE_ARC4RANDOM_BUF) < 1
static ulong entropy_jitter(void); static ulong entropy_jitter(void);
#endif
static void write_mac_part(size_t partnum); static void write_mac_part(size_t partnum);
/* /*
@@ -661,6 +671,11 @@ static int post_rw_checksum[] = {0, 0};
static dev_t gbe_dev; static dev_t gbe_dev;
static ino_t gbe_ino; static ino_t gbe_ino;
#if defined(HAVE_ARC4RANDOM_BUF) && \
(HAVE_ARC4RANDOM_BUF) > 0
void arc4random_buf(void *buf, size_t n);
#endif
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
@@ -1246,6 +1261,22 @@ hextonum(char ch_s)
return 16; /* invalid character */ return 16; /* invalid character */
} }
#if defined(HAVE_ARC4RANDOM_BUF) && \
(HAVE_ARC4RANDOM_BUF) > 0
static ushort
rhex(void)
{
static u8 num[12];
static size_t n = 0;
if (!n) {
n = 12;
arc4random_buf(num, 12);
}
return num[--n] & 0xf;
}
#else
static ushort static ushort
rhex(void) rhex(void)
{ {
@@ -1300,6 +1331,7 @@ entropy_jitter(void)
return mix; return mix;
} }
#endif
static void static void
write_mac_part(size_t partnum) write_mac_part(size_t partnum)