liz/veilid
liz/veilid
1
0
Fork 0
Code Pull Requests Packages Releases Activity

Merge branch 'subgraf/use-getrandom-in-wasm' into 'main'

Browse Source 
Use getrandom for RNG implementation in WASM

See merge request veilid/veilid!168
This commit is contained in:
Christien Rioux 2023-09-03 00:30:34 +00:00
commit 4f2777ef84
No known key found for this signature in database
2 changed files with 14 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
veilid-tools/Cargo.toml
View File

@ -77,6 +77,7 @@ wasm-bindgen = "0.2.87"
js-sys = "0.3.64" js-sys = "0.3.64"
wasm-bindgen-futures = "0.4.37" wasm-bindgen-futures = "0.4.37"
async_executors = { version = "0.7.0", default-features = false } async_executors = { version = "0.7.0", default-features = false }
getrandom = { version = "0.2", features = ["js"] }
async-lock = "2.8.0" async-lock = "2.8.0"
send_wrapper = { version = "0.6.0", features = ["futures"] } send_wrapper = { version = "0.6.0", features = ["futures"] }

39
veilid-tools/src/random.rs
View File

@ -25,43 +25,6 @@ impl RngCore for VeilidRng {
} }
} }
cfg_if! {
if #[cfg(target_arch = "wasm32")] {
use js_sys::Math;
pub fn random_bytes(dest: &mut [u8]) {
let len = dest.len();
let u32len = len / 4;
let remlen = len % 4;
for n in 0..u32len {
let r = (Math::random() * (u32::max_value() as f64)) as u32;
dest[n * 4 + 0] = (r & 0xFF) as u8;
dest[n * 4 + 1] = ((r >> 8) & 0xFF) as u8;
dest[n * 4 + 2] = ((r >> 16) & 0xFF) as u8;
dest[n * 4 + 3] = ((r >> 24) & 0xFF) as u8;
}
if remlen > 0 {
let r = (Math::random() * (u32::max_value() as f64)) as u32;
for n in 0..remlen {
dest[u32len * 4 + n] = ((r >> (n * 8)) & 0xFF) as u8;
}
}
}
pub fn get_random_u32() -> u32 {
(Math::random() * (u32::max_value() as f64)) as u32
}
pub fn get_random_u64() -> u64 {
let v1: u32 = get_random_u32();
let v2: u32 = get_random_u32();
((v1 as u64) << 32) | ((v2 as u32) as u64)
}
} else {
pub fn random_bytes(dest: &mut [u8]) { pub fn random_bytes(dest: &mut [u8]) {
let mut rng = rand::thread_rng(); let mut rng = rand::thread_rng();
rng.fill_bytes(dest); rng.fill_bytes(dest);
@ -76,5 +39,3 @@ cfg_if! {
let mut rng = rand::thread_rng(); let mut rng = rand::thread_rng();
rng.next_u64() rng.next_u64()
} }
}
}