Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/scripts/install_sgx_sdk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@ if [ $# -eq 0 ]; then
fi
SDK_DIR_PREFIX=$1

DCAP_VERSION=1.23.100.0-jammy1
DCAP_VERSION=1.23.100.0-noble1
# create tmp dir
TMP_DIR=$(mktemp -d)
echo "Created temp dir: $TMP_DIR"
cd $TMP_DIR

wget https://download.01.org/intel-sgx/sgx-dcap/1.21/linux/distro/ubuntu22.04-server/sgx_linux_x64_sdk_2.24.100.3.bin -O sgx_linux_x64_sdk.bin
wget https://download.01.org/intel-sgx/sgx-dcap/1.23/linux/distro/ubuntu24.04-server/sgx_linux_x64_sdk_2.26.100.0.bin -O sgx_linux_x64_sdk.bin
chmod a+x sgx_linux_x64_sdk.bin
./sgx_linux_x64_sdk.bin --prefix=$SDK_DIR_PREFIX
rm -rf ./sgx_linux_x64_sdk.bin

wget https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key
cat intel-sgx-deb.key | tee /etc/apt/keyrings/intel-sgx-keyring.asc > /dev/null
echo 'deb [signed-by=/etc/apt/keyrings/intel-sgx-keyring.asc arch=amd64] https://download.01.org/intel-sgx/sgx_repo/ubuntu jammy main' | tee /etc/apt/sources.list.d/intel-sgx.list
echo 'deb [signed-by=/etc/apt/keyrings/intel-sgx-keyring.asc arch=amd64] https://download.01.org/intel-sgx/sgx_repo/ubuntu noble main' | tee /etc/apt/sources.list.d/intel-sgx.list

apt-get update -y
apt-get install -y libsgx-dcap-ql=$DCAP_VERSION libsgx-dcap-ql-dev=$DCAP_VERSION
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ on:

jobs:
test:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
env:
SGX_MODE: SW
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: nightly-2025-12-05
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ enclave-test:
untrusted-test:
@echo "Running untrusted crate tests..."
@echo "Testing sgx-types..."
@cd sgx-types && cargo test --features urts
@cargo +stable test --manifest-path sgx-types/Cargo.toml --features urts
@echo "Testing sgx-urts..."
@cd sgx-urts && cargo test --features simulate_utils
@cargo +stable test --manifest-path sgx-urts/Cargo.toml --no-default-features --features simulate_utils
@echo "Testing sgx-build..."
@cd sgx-build && cargo test
@cargo +stable test --manifest-path sgx-build/Cargo.toml
@echo "Testing cargo-sgx..."
@cd cargo-sgx && cargo test
@cargo +stable test --manifest-path cargo-sgx/Cargo.toml

.PHONY: toml-fmt
toml-fmt:
Expand Down
2 changes: 1 addition & 1 deletion samples/hello-rust/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Paths
SGX_SDK ?= /opt/sgxsdk
SGX_SDK ?= /opt/intel/sgxsdk
DEBUG := 0
ifeq ($(DEBUG), 0)
PROFILE := release
Expand Down
3 changes: 2 additions & 1 deletion sgx-urts/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@ name = "sgx_urts"
crate-type = ["rlib"]

[features]
default = []
default = ["signal"]
global_init = ["global_exit"]
global_exit = ["global_init"]
simulate_utils = ["tracing", "object", "iced-x86"]
signal = []

[dependencies]
sgx-types = { path = "../sgx-types", default-features = false, features = ["urts"] }
Expand Down
3 changes: 2 additions & 1 deletion sgx-urts/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License..

#![feature(linkage)]
#![cfg_attr(feature = "signal", feature(linkage))]
#![allow(clippy::not_unsafe_ptr_arg_deref)]

pub mod asyncio;
Expand All @@ -27,6 +27,7 @@ pub mod mem;
pub mod net;
pub mod pipe;
pub mod process;
#[cfg(feature = "signal")]
pub mod signal;
#[cfg(feature = "simulate_utils")]
pub mod simulate;
Expand Down
2 changes: 1 addition & 1 deletion unit-test/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Paths
SGX_SDK ?= /opt/sgxsdk
SGX_SDK ?= /opt/intel/sgxsdk
DEBUG := 0
ifeq ($(DEBUG), 0)
PROFILE := release
Expand Down