reftable/system: introduce `reftable_rand()`
Introduce a new system-level `reftable_rand()` function that generates a single unsigned integer for us. The implementation of this function is to be provided by the calling codebase, which allows us to more easily hook into pre-seeded random number generators. Adapt the two callsites where we generated random data. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>maint
parent
01a587da8c
commit
712f6cfe54
|
@ -523,7 +523,7 @@ static int reftable_stack_reload_maybe_reuse(struct reftable_stack *st,
|
||||||
close(fd);
|
close(fd);
|
||||||
fd = -1;
|
fd = -1;
|
||||||
|
|
||||||
delay = delay + (delay * git_rand(CSPRNG_BYTES_INSECURE)) / UINT32_MAX + 1;
|
delay = delay + (delay * reftable_rand()) / UINT32_MAX + 1;
|
||||||
sleep_millisec(delay);
|
sleep_millisec(delay);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -688,7 +688,7 @@ int reftable_stack_add(struct reftable_stack *st,
|
||||||
static int format_name(struct reftable_buf *dest, uint64_t min, uint64_t max)
|
static int format_name(struct reftable_buf *dest, uint64_t min, uint64_t max)
|
||||||
{
|
{
|
||||||
char buf[100];
|
char buf[100];
|
||||||
uint32_t rnd = git_rand(CSPRNG_BYTES_INSECURE);
|
uint32_t rnd = reftable_rand();
|
||||||
snprintf(buf, sizeof(buf), "0x%012" PRIx64 "-0x%012" PRIx64 "-%08x",
|
snprintf(buf, sizeof(buf), "0x%012" PRIx64 "-0x%012" PRIx64 "-%08x",
|
||||||
min, max, rnd);
|
min, max, rnd);
|
||||||
reftable_buf_reset(dest);
|
reftable_buf_reset(dest);
|
||||||
|
|
|
@ -4,6 +4,11 @@
|
||||||
#include "../lockfile.h"
|
#include "../lockfile.h"
|
||||||
#include "../tempfile.h"
|
#include "../tempfile.h"
|
||||||
|
|
||||||
|
uint32_t reftable_rand(void)
|
||||||
|
{
|
||||||
|
return git_rand(CSPRNG_BYTES_INSECURE);
|
||||||
|
}
|
||||||
|
|
||||||
int tmpfile_from_pattern(struct reftable_tmpfile *out, const char *pattern)
|
int tmpfile_from_pattern(struct reftable_tmpfile *out, const char *pattern)
|
||||||
{
|
{
|
||||||
struct tempfile *tempfile;
|
struct tempfile *tempfile;
|
||||||
|
|
|
@ -14,6 +14,12 @@ https://developers.google.com/open-source/licenses/bsd
|
||||||
#include "git-compat-util.h"
|
#include "git-compat-util.h"
|
||||||
#include "compat/zlib-compat.h"
|
#include "compat/zlib-compat.h"
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Return a random 32 bit integer. This function is expected to return
|
||||||
|
* pre-seeded data.
|
||||||
|
*/
|
||||||
|
uint32_t reftable_rand(void);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* An implementation-specific temporary file. By making this specific to the
|
* An implementation-specific temporary file. By making this specific to the
|
||||||
* implementation it becomes possible to tie temporary files into any kind of
|
* implementation it becomes possible to tie temporary files into any kind of
|
||||||
|
|
Loading…
Reference in New Issue