Skip to content

Commit

Permalink
Unrolled build for rust-lang#131774
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#131774 - thesummer:rtems-add-getentropy, r=joboet

Add getentropy for RTEMS

RTEMS provides the `getentropy` function.
Use this for providing random data.

This PR enables the `getentropy` function for the RTEMS operating system to get random data.
It is exposed via libc  (see rust-lang/libc#3975).
  • Loading branch information
rust-timer authored Oct 18, 2024
2 parents acfdb8d + e20636a commit 441a2c6
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 0 deletions.
1 change: 1 addition & 0 deletions library/std/src/random.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ use crate::sys::random as sys;
/// Horizon | `getrandom` shim
/// Hurd, L4Re, QNX | `/dev/urandom`
/// Redox | `/scheme/rand`
/// RTEMS | [`arc4random_buf`](https://docs.rtems.org/branches/master/bsp-howto/getentropy.html)
/// SGX | [`rdrand`](https://en.wikipedia.org/wiki/RDRAND)
/// SOLID | `SOLID_RNG_SampleRandomBytes`
/// TEEOS | `TEE_GenerateRandom`
Expand Down
2 changes: 2 additions & 0 deletions library/std/src/sys/random/arc4random.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#[cfg(not(any(
target_os = "haiku",
target_os = "illumos",
target_os = "rtems",
target_os = "solaris",
target_os = "vita",
)))]
Expand All @@ -21,6 +22,7 @@ use libc::arc4random_buf;
#[cfg(any(
target_os = "haiku", // See https://git.haiku-os.org/haiku/tree/headers/compatibility/bsd/stdlib.h
target_os = "illumos", // See https://www.illumos.org/man/3C/arc4random
target_os = "rtems", // See https://docs.rtems.org/branches/master/bsp-howto/getentropy.html
target_os = "solaris", // See https://docs.oracle.com/cd/E88353_01/html/E37843/arc4random-3c.html
target_os = "vita", // See https://github.com/vitasdk/newlib/blob/b89e5bc183b516945f9ee07eef483ecb916e45ff/newlib/libc/include/stdlib.h#L74
))]
Expand Down
1 change: 1 addition & 0 deletions library/std/src/sys/random/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ cfg_if::cfg_if! {
target_os = "illumos",
target_os = "netbsd",
target_os = "openbsd",
target_os = "rtems",
target_os = "solaris",
target_os = "vita",
))] {
Expand Down

0 comments on commit 441a2c6

Please sign in to comment.