From fdbf109b635d8928b7b47570f2a8f00ec9d39d94 Mon Sep 17 00:00:00 2001 From: joboet Date: Sun, 26 Feb 2023 11:33:28 +0100 Subject: [PATCH 1/2] std: use random HashMap keys on Hermit --- library/std/src/sys/hermit/mod.rs | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/library/std/src/sys/hermit/mod.rs b/library/std/src/sys/hermit/mod.rs index d34a4cfedea78..d0e09890b8b6c 100644 --- a/library/std/src/sys/hermit/mod.rs +++ b/library/std/src/sys/hermit/mod.rs @@ -76,9 +76,24 @@ pub fn abort_internal() -> ! { } } -// FIXME: just a workaround to test the system pub fn hashmap_random_keys() -> (u64, u64) { - (1, 2) + let mut buf = [0; 16]; + let mut slice = &mut buf[..]; + while !slice.is_empty() { + let res = unsafe { abi::read_entropy(slice.as_mut_ptr(), slice.len(), 0) }; + if res < 0 { + panic!( + "random key generation failed: {}", + crate::io::Error::from_raw_os_error(-res as i32) + ); + } else { + slice = &mut slice[res as usize..]; + } + } + + let key1 = buf[..8].try_into().unwrap(); + let key2 = buf[8..].try_into().unwrap(); + (u64::from_ne_bytes(key1), u64::from_ne_bytes(key2)) } // This function is needed by the panic runtime. The symbol is named in From f6bde0352b52eb3b31c78b7abd70c1be396ccb0f Mon Sep 17 00:00:00 2001 From: joboet Date: Wed, 29 Mar 2023 10:52:48 +0200 Subject: [PATCH 2/2] std: use `cvt` to handle errors from `read_entropy` on Hermit --- library/std/src/sys/hermit/mod.rs | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/library/std/src/sys/hermit/mod.rs b/library/std/src/sys/hermit/mod.rs index d0e09890b8b6c..111150b06e1b0 100644 --- a/library/std/src/sys/hermit/mod.rs +++ b/library/std/src/sys/hermit/mod.rs @@ -80,15 +80,9 @@ pub fn hashmap_random_keys() -> (u64, u64) { let mut buf = [0; 16]; let mut slice = &mut buf[..]; while !slice.is_empty() { - let res = unsafe { abi::read_entropy(slice.as_mut_ptr(), slice.len(), 0) }; - if res < 0 { - panic!( - "random key generation failed: {}", - crate::io::Error::from_raw_os_error(-res as i32) - ); - } else { - slice = &mut slice[res as usize..]; - } + let res = cvt(unsafe { abi::read_entropy(slice.as_mut_ptr(), slice.len(), 0) }) + .expect("failed to generate random hashmap keys"); + slice = &mut slice[res as usize..]; } let key1 = buf[..8].try_into().unwrap();