Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Fix random for Mac users #9670

Merged
merged 2 commits into from
Nov 1, 2024
Merged

fix: Fix random for Mac users #9670

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73055de
use getentropy on macs
Rumata888 Nov 1, 2024
2bcc82b
incorrect test fixed
Rumata888 Nov 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions barretenberg/cpp/src/barretenberg/numeric/random/engine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,18 @@ namespace bb::numeric {

namespace {

#ifndef __wasm__
// When working on native we allocate 1M of memory to sample randomness from urandom
constexpr size_t RANDOM_BUFFER_SIZE = 1UL << 20;
#else
// In wasm the API we are using can only give 256 bytes per call, so there is no point in creating a larger buffer
#if defined(__wasm__) || defined(__APPLE__)

// In wasm and on mac os the API we are using can only give 256 bytes per call, so there is no point in creating a
// larger buffer
constexpr size_t RANDOM_BUFFER_SIZE = 256;
constexpr size_t BYTES_PER_GETENTROPY_READ = 256;

#else

// When working on native we allocate 1M of memory to sample randomness from urandom
constexpr size_t RANDOM_BUFFER_SIZE = 1UL << 20;

#endif
struct RandomBufferWrapper {
// Buffer with randomness sampled from a CSPRNG
Expand Down Expand Up @@ -46,14 +51,14 @@ template <size_t size_in_unsigned_ints> std::array<unsigned int, size_in_unsigne
uint8_t* current_offset = random_buffer_wrapper.buffer;
// Sample until we fill the buffer
while (bytes_left != 0) {
#ifndef __wasm__
// Sample from urandom on native
auto read_bytes = getrandom(current_offset, bytes_left, 0);
#else
#if defined(__wasm__) || defined(__APPLE__)
// Sample through a "syscall" on wasm. We can't request more than 256, it fails and results in an infinite
// loop
ssize_t read_bytes =
getentropy(current_offset, BYTES_PER_GETENTROPY_READ) == -1 ? -1 : BYTES_PER_GETENTROPY_READ;
#else
// Sample from urandom on native
auto read_bytes = getrandom(current_offset, bytes_left, 0);
#endif
// If we read something, update the leftover
if (read_bytes != -1) {
Expand Down
Loading