general/occlum
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[deps/rust-sgx-sdk] Upgrade rust-sgx-sdk to 1.1.5

Browse Source
This commit is contained in:
volcano0dr 2022-08-01 18:48:12 +08:00 committed by Zongmin.Gu
parent bc02428384
commit 69b35e6429
17 changed files with 50 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/remote_attestation/init_ra_flow/init_ra/Cargo.toml
View File

@ -3,7 +3,7 @@ name = "init"
version = "0.0.1" version = "0.0.1"
build = "build.rs" build = "build.rs"
authors = ["LI Qing geding.lq@antgroup.com"] authors = ["LI Qing geding.lq@antgroup.com"]
edition = "2018" edition = "2021"
[dependencies] [dependencies]
libc = "0.2.84" libc = "0.2.84"

2
deps/rust-sgx-sdk vendored

@ -1 +1 @@
Subproject commit 653ffa62d35fa2996e4a45e9ff89a1391cbd0133 Subproject commit 13fb3476f53d21614bb863dc7de825e70938ce36

2
example/init_ra/Cargo.toml
View File

@ -3,7 +3,7 @@ name = "init"
version = "0.0.1" version = "0.0.1"
build = "build.rs" build = "build.rs"
authors = ["LI Qing geding.lq@antgroup.com"] authors = ["LI Qing geding.lq@antgroup.com"]
edition = "2018" edition = "2021"
[dependencies] [dependencies]
libc = "0.2.84" libc = "0.2.84"

4
src/exec/Cargo.toml
View File

@ -1,7 +1,7 @@
[package] [package]
name = "occlum_exec" name = "occlum_exec"
version = "0.28.1" version = "0.29.0"
edition = "2018" edition = "2021"
[lib] [lib]
doctest = false doctest = false

2
src/exec/rust-toolchain
View File

@ -1 +1 @@
nightly-2021-11-01 nightly-2022-02-23

30
src/libos/Cargo.lock generated
View File

@ -218,7 +218,7 @@ dependencies = [
[[package]] [[package]]
name = "hashbrown_tstd" name = "hashbrown_tstd"
version = "0.11.2" version = "0.12.0"
[[package]] [[package]]
name = "ident_case" name = "ident_case"
@ -591,11 +591,11 @@ dependencies = [
[[package]] [[package]]
name = "sgx_alloc" name = "sgx_alloc"
version = "1.1.4" version = "1.1.5"
[[package]] [[package]]
name = "sgx_backtrace_sys" name = "sgx_backtrace_sys"
version = "1.1.4" version = "1.1.5"
dependencies = [ dependencies = [
"cc", "cc",
"sgx_build_helper", "sgx_build_helper",
@ -604,11 +604,11 @@ dependencies = [
[[package]] [[package]]
name = "sgx_build_helper" name = "sgx_build_helper"
version = "1.1.4" version = "1.1.5"
[[package]] [[package]]
name = "sgx_cov" name = "sgx_cov"
version = "1.1.4" version = "1.1.5"
dependencies = [ dependencies = [
"lazy_static", "lazy_static",
"profiler_builtins", "profiler_builtins",
@ -620,18 +620,18 @@ dependencies = [
[[package]] [[package]]
name = "sgx_demangle" name = "sgx_demangle"
version = "1.1.4" version = "1.1.5"
[[package]] [[package]]
name = "sgx_libc" name = "sgx_libc"
version = "1.1.4" version = "1.1.5"
dependencies = [ dependencies = [
"sgx_types", "sgx_types",
] ]
[[package]] [[package]]
name = "sgx_rand" name = "sgx_rand"
version = "1.1.4" version = "1.1.5"
dependencies = [ dependencies = [
"sgx_trts", "sgx_trts",
"sgx_tstd", "sgx_tstd",
@ -640,14 +640,14 @@ dependencies = [
[[package]] [[package]]
name = "sgx_tcrypto" name = "sgx_tcrypto"
version = "1.1.4" version = "1.1.5"
dependencies = [ dependencies = [
"sgx_types", "sgx_types",
] ]
[[package]] [[package]]
name = "sgx_tprotected_fs" name = "sgx_tprotected_fs"
version = "1.1.4" version = "1.1.5"
dependencies = [ dependencies = [
"sgx_trts", "sgx_trts",
"sgx_types", "sgx_types",
@ -655,7 +655,7 @@ dependencies = [
[[package]] [[package]]
name = "sgx_trts" name = "sgx_trts"
version = "1.1.4" version = "1.1.5"
dependencies = [ dependencies = [
"sgx_libc", "sgx_libc",
"sgx_types", "sgx_types",
@ -663,14 +663,14 @@ dependencies = [
[[package]] [[package]]
name = "sgx_tse" name = "sgx_tse"
version = "1.1.4" version = "1.1.5"
dependencies = [ dependencies = [
"sgx_types", "sgx_types",
] ]
[[package]] [[package]]
name = "sgx_tstd" name = "sgx_tstd"
version = "1.1.4" version = "1.1.5"
dependencies = [ dependencies = [
"hashbrown_tstd", "hashbrown_tstd",
"sgx_alloc", "sgx_alloc",
@ -685,11 +685,11 @@ dependencies = [
[[package]] [[package]]
name = "sgx_types" name = "sgx_types"
version = "1.1.4" version = "1.1.5"
[[package]] [[package]]
name = "sgx_unwind" name = "sgx_unwind"
version = "1.1.4" version = "1.1.5"
dependencies = [ dependencies = [
"sgx_build_helper", "sgx_build_helper",
] ]

4
src/libos/Cargo.toml
View File

@ -1,7 +1,7 @@
[package] [package]
name = "Occlum" name = "Occlum"
version = "0.28.1" version = "0.29.0"
edition = "2018" edition = "2021"
[lib] [lib]
name = "occlum_libos_core_rs" name = "occlum_libos_core_rs"

2
src/libos/rust-toolchain
View File

@ -1 +1 @@
nightly-2021-11-01 nightly-2022-02-23

12
src/libos/src/entry.rs
View File

@ -107,40 +107,40 @@ pub extern "C" fn occlum_ecall_init(
// Parse host file // Parse host file
let resolv_conf_ptr = unsafe { (*file_buffer).resolv_conf_buf }; let resolv_conf_ptr = unsafe { (*file_buffer).resolv_conf_buf };
match parse_host_file(HostFile::RESOLV_CONF, resolv_conf_ptr) { match parse_host_file(HostFile::ResolvConf, resolv_conf_ptr) {
Err(e) => { Err(e) => {
error!("failed to parse /etc/resolv.conf: {}", e.backtrace()); error!("failed to parse /etc/resolv.conf: {}", e.backtrace());
} }
Ok(resolv_conf_str) => { Ok(resolv_conf_str) => {
*RESOLV_CONF_STR.write().unwrap() = Some(resolv_conf_str); *RESOLV_CONF_STR.write().unwrap() = Some(resolv_conf_str);
if let Err(e) = write_host_file(HostFile::RESOLV_CONF) { if let Err(e) = write_host_file(HostFile::ResolvConf) {
error!("failed to write /etc/resolv.conf: {}", e.backtrace()); error!("failed to write /etc/resolv.conf: {}", e.backtrace());
} }
} }
} }
let hostname_ptr = unsafe { (*file_buffer).hostname_buf }; let hostname_ptr = unsafe { (*file_buffer).hostname_buf };
match parse_host_file(HostFile::HOSTNAME, hostname_ptr) { match parse_host_file(HostFile::HostName, hostname_ptr) {
Err(e) => { Err(e) => {
error!("failed to parse /etc/hostname: {}", e.backtrace()); error!("failed to parse /etc/hostname: {}", e.backtrace());
} }
Ok(hostname_str) => { Ok(hostname_str) => {
misc::init_nodename(&hostname_str); misc::init_nodename(&hostname_str);
*HOSTNAME_STR.write().unwrap() = Some(hostname_str); *HOSTNAME_STR.write().unwrap() = Some(hostname_str);
if let Err(e) = write_host_file(HostFile::HOSTNAME) { if let Err(e) = write_host_file(HostFile::HostName) {
error!("failed to write /etc/hostname: {}", e.backtrace()); error!("failed to write /etc/hostname: {}", e.backtrace());
} }
} }
} }
let hosts_ptr = unsafe { (*file_buffer).hosts_buf }; let hosts_ptr = unsafe { (*file_buffer).hosts_buf };
match parse_host_file(HostFile::HOSTS, hosts_ptr) { match parse_host_file(HostFile::Hosts, hosts_ptr) {
Err(e) => { Err(e) => {
error!("failed to parse /etc/hosts: {}", e.backtrace()); error!("failed to parse /etc/hosts: {}", e.backtrace());
} }
Ok(hosts_str) => { Ok(hosts_str) => {
*HOSTS_STR.write().unwrap() = Some(hosts_str); *HOSTS_STR.write().unwrap() = Some(hosts_str);
if let Err(e) = write_host_file(HostFile::HOSTS) { if let Err(e) = write_host_file(HostFile::Hosts) {
error!("failed to write /etc/hosts: {}", e.backtrace()); error!("failed to write /etc/hosts: {}", e.backtrace());
} }
} }

6
src/libos/src/fs/fs_ops/mount.rs
View File

@ -31,15 +31,15 @@ pub fn do_mount_rootfs(
}); });
// Write resolv.conf file into mounted file system // Write resolv.conf file into mounted file system
write_host_file(HostFile::RESOLV_CONF)?; write_host_file(HostFile::ResolvConf)?;
*RESOLV_CONF_STR.write().unwrap() = None; *RESOLV_CONF_STR.write().unwrap() = None;
// Write hostname file into mounted file system // Write hostname file into mounted file system
write_host_file(HostFile::HOSTNAME)?; write_host_file(HostFile::HostName)?;
*HOSTNAME_STR.write().unwrap() = None; *HOSTNAME_STR.write().unwrap() = None;
// Write hosts file into mounted file system // Write hosts file into mounted file system
write_host_file(HostFile::HOSTS)?; write_host_file(HostFile::Hosts)?;
*HOSTS_STR.write().unwrap() = None; *HOSTS_STR.write().unwrap() = None;
Ok(()) Ok(())

2
src/libos/src/fs/hostfs.rs
View File

@ -355,7 +355,7 @@ trait IntoFsMetadata {
impl IntoFsMetadata for fs::Metadata { impl IntoFsMetadata for fs::Metadata {
fn into_fs_metadata(self) -> Metadata { fn into_fs_metadata(self) -> Metadata {
use sgx_trts::libc; use sgx_trts::libc;
use std::os::fs::MetadataExt; use std::os::linux::fs::MetadataExt;
Metadata { Metadata {
dev: self.st_dev() as usize, dev: self.st_dev() as usize,
inode: self.st_ino() as usize, inode: self.st_ino() as usize,

1
src/libos/src/lib.rs
View File

@ -16,7 +16,6 @@
#![feature(dropck_eyepatch)] #![feature(dropck_eyepatch)]
// for UntrustedSliceAlloc in slice_alloc // for UntrustedSliceAlloc in slice_alloc
#![feature(slice_ptr_get)] #![feature(slice_ptr_get)]
#![feature(maybe_uninit_extra)]
#![feature(get_mut_unchecked)] #![feature(get_mut_unchecked)]
// for std::hint::black_box // for std::hint::black_box
#![feature(test)] #![feature(test)]

24
src/libos/src/util/host_file_util.rs
View File

@ -15,16 +15,16 @@ pub struct host_file_buffer {
} }
pub enum HostFile { pub enum HostFile {
HOSTS, Hosts,
HOSTNAME, HostName,
RESOLV_CONF, ResolvConf,
} }
pub fn write_host_file(host_file: HostFile) -> Result<()> { pub fn write_host_file(host_file: HostFile) -> Result<()> {
let file_path: &str = match host_file { let file_path: &str = match host_file {
HostFile::HOSTS => "/etc/hosts", HostFile::Hosts => "/etc/hosts",
HostFile::HOSTNAME => "/etc/hostname", HostFile::HostName => "/etc/hostname",
HostFile::RESOLV_CONF => "/etc/resolv.conf", HostFile::ResolvConf => "/etc/resolv.conf",
_ => return_errno!(EINVAL, "Unsupported host file"), _ => return_errno!(EINVAL, "Unsupported host file"),
}; };
@ -37,9 +37,9 @@ pub fn write_host_file(host_file: HostFile) -> Result<()> {
)?; )?;
let host_file_str = match host_file { let host_file_str = match host_file {
HostFile::HOSTS => HOSTS_STR.read().unwrap(), HostFile::Hosts => HOSTS_STR.read().unwrap(),
HostFile::HOSTNAME => HOSTNAME_STR.read().unwrap(), HostFile::HostName => HOSTNAME_STR.read().unwrap(),
HostFile::RESOLV_CONF => RESOLV_CONF_STR.read().unwrap(), HostFile::ResolvConf => RESOLV_CONF_STR.read().unwrap(),
_ => return_errno!(EINVAL, "Unsupported host file"), _ => return_errno!(EINVAL, "Unsupported host file"),
}; };
@ -62,12 +62,12 @@ pub fn parse_host_file(host_file: HostFile, host_file_ptr: *const c_char) -> Res
// Parse and inspect host file // Parse and inspect host file
match host_file { match host_file {
HostFile::HOSTS => { HostFile::Hosts => {
if let Err(_) = hosts_parser_util::parse_hosts_buffer(host_file_bytes) { if let Err(_) = hosts_parser_util::parse_hosts_buffer(host_file_bytes) {
return_errno!(EINVAL, "malformated host /etc/hosts"); return_errno!(EINVAL, "malformated host /etc/hosts");
} }
} }
HostFile::HOSTNAME => match hosts_parser_util::parse_hostname_buffer(host_file_bytes) { HostFile::HostName => match hosts_parser_util::parse_hostname_buffer(host_file_bytes) {
Err(_) => { Err(_) => {
return_errno!(EINVAL, "malformated host /etc/hostname"); return_errno!(EINVAL, "malformated host /etc/hostname");
} }
@ -75,7 +75,7 @@ pub fn parse_host_file(host_file: HostFile, host_file_ptr: *const c_char) -> Res
return Ok(hostname_str); return Ok(hostname_str);
} }
}, },
HostFile::RESOLV_CONF => { HostFile::ResolvConf => {
if let Err(_) = resolv_conf::Config::parse(host_file_bytes) { if let Err(_) = resolv_conf::Config::parse(host_file_bytes) {
return_errno!(EINVAL, "malformated host /etc/resolv.conf"); return_errno!(EINVAL, "malformated host /etc/resolv.conf");
} }

2
tools/copy_bom/Cargo.toml
View File

@ -1,7 +1,7 @@
[package] [package]
name = "copy_bom" name = "copy_bom"
version = "0.1.0" version = "0.1.0"
edition = "2018" edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

2
tools/gen_internal_conf/Cargo.toml
View File

@ -2,7 +2,7 @@
name = "gen_internal_conf" name = "gen_internal_conf"
version = "0.2.0" version = "0.2.0"
authors = ["zongmin.gu <zongmin.gzm@alibaba-inc.com>"] authors = ["zongmin.gu <zongmin.gzm@alibaba-inc.com>"]
edition = "2018" edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

2
tools/init/Cargo.toml
View File

@ -2,7 +2,7 @@
name = "init" name = "init"
version = "0.0.1" version = "0.0.1"
authors = ["LI Qing geding.lq@antgroup.com"] authors = ["LI Qing geding.lq@antgroup.com"]
edition = "2018" edition = "2021"
[dependencies] [dependencies]
libc = "0.2.84" libc = "0.2.84"

2
tools/toolchains/dcap_lib/Cargo.lock generated
View File

@ -25,4 +25,4 @@ dependencies = [
[[package]] [[package]]
name = "sgx_types" name = "sgx_types"
version = "1.1.4" version = "1.1.5"