Skip to content

Commit 2065c83

Browse files
Add support for x86_64-fortanix-unknown-sgx target
1 parent 9859d62 commit 2065c83

File tree

2 files changed

+24
-1
lines changed

2 files changed

+24
-1
lines changed

Cargo.toml

+4
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,10 @@ libc = { version = "0.2.45" }
298298
[target.'cfg(any(target_os = "redox", all(unix, not(any(target_os = "macos", target_os = "ios")))))'.dependencies]
299299
lazy_static = "1.2"
300300

301+
[target.'cfg(target_env = "sgx")'.dependencies]
302+
rand_core = "0.3.0"
303+
rdrand = "0.4.0"
304+
301305
# Keep this in sync with `[dependencies]` in pregenerate_asm/Cargo.toml.
302306
[build-dependencies]
303307
cc = "1.0.26"

src/rand.rs

+20-1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ pub trait SecureRandom: sealed::Sealed {
6060
/// On Windows, `fill` is implemented using the platform's API for secure
6161
/// random number generation.
6262
///
63+
/// On SGX, `fill()` is implemented using the `RDRAND` instruction.
64+
///
6365
/// Otherwise, `fill()` is implemented by reading from `/dev/urandom`. (This is
6466
/// something that should be improved for any platform that adds something
6567
/// better.)
@@ -93,7 +95,7 @@ impl SecureRandom for SystemRandom {
9395

9496
impl sealed::Sealed for SystemRandom {}
9597

96-
#[cfg(not(any(target_os = "linux", target_os = "macos", target_os = "ios", windows)))]
98+
#[cfg(not(any(target_os = "linux", target_os = "macos", target_os = "ios", windows, target_env = "sgx")))]
9799
use self::urandom::fill as fill_impl;
98100

99101
#[cfg(any(
@@ -107,6 +109,10 @@ use self::sysrand_or_urandom::fill as fill_impl;
107109

108110
#[cfg(any(target_os = "macos", target_os = "ios"))]
109111
use self::darwin::fill as fill_impl;
112+
113+
#[cfg(target_env = "sgx")]
114+
use self::rdrandom::fill as fill_impl;
115+
110116
use crate::sealed;
111117

112118
#[cfg(target_os = "linux")]
@@ -275,6 +281,19 @@ mod darwin {
275281
}
276282
}
277283

284+
#[cfg(target_env = "sgx")]
285+
mod rdrandom {
286+
use crate::error;
287+
use rdrand::RdRand;
288+
use rand_core::RngCore;
289+
290+
pub fn fill(dest: &mut [u8]) -> Result<(), error::Unspecified> {
291+
let mut rng = RdRand::new().map_err(|_| error::Unspecified)?;
292+
rng.try_fill_bytes(dest).map_err(|_| error::Unspecified)?;
293+
Ok(())
294+
}
295+
}
296+
278297
#[cfg(test)]
279298
mod tests {
280299
use crate::rand::{self, SecureRandom};

0 commit comments

Comments
 (0)