Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix to use the latest Islet SDK #245

Merged
merged 2 commits into from
May 7, 2024
Merged

Fix to use the latest Islet SDK #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04b997a
Fix to use the latest Islet SDK
bitboom Apr 29, 2024
d417918
Restore ISLET-related build-and-test on CI
bitboom Apr 30, 2024
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: 0 additions & 6 deletions CI/scripts/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -791,9 +791,6 @@ function test-ISLET-SDK-shim_test() {
echo "* Download ISLET SDK, build the library and run shim_test"
echo "**********************************************************"
echo " "
echo "****** WARNING! Skipped due to open issue #242, Fails on Ubuntu 22.04.4"
echo " "
return

pushd src/islet > /dev/null 2>&1

Expand All @@ -819,9 +816,6 @@ function test-run_example-simple_app_under_islet-using-shim() {
echo "* Test: Execute script to compile, build and run simple_app_under_islet using shim"
echo "***********************************************************************************"
echo " "
echo "****** WARNING! Skipped due to open issue #242, Fails on Ubuntu 22.04.4"
echo " "
return

pushd ./sample_apps > /dev/null 2>&1

Expand Down
6 changes: 5 additions & 1 deletion sample_apps/run_example.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1108,7 +1108,11 @@ function get_measurement_of_trusted_simple_app_under_islet() {
# get_measurement_of_app_by_name "islet_example_app.exe"

run_cmd
local mrenclave="6190EB90B293886C172EC644DAFB7E33EE2CEA6541ABE15300D96380DF525BF9"
bitboom marked this conversation as resolved.
Show resolved Hide resolved
# The following mrenclave value should hardly change as it is
# a simulated version targeting x86_64. (The actual version only works on aarch64.)
# If you want to manually obtain the mrenclave value, refer to the islet CLI at the link below.
# https://github.com/islet-project/islet/blob/main/examples/cross-platform-e2ee/README.md#2-configure-measurements-and-policies
local mrenclave="580bd77074f789f34841ea9920579ff29a59b9452b606f73811132b31c689da9"
bitboom marked this conversation as resolved.
Show resolved Hide resolved
local measurement_file="example_app.measurement"

run_pushd "${PROV_DIR}"
Expand Down
9 changes: 5 additions & 4 deletions third_party/islet/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,15 @@ ISLET_INC="$HERE/include"
ISLET_LIB="$HERE/lib"

TARGET_HDR="$ISLET_SDK/include/islet.h"
TARGET_LIB="$ISLET/out/x86_64-unknown-linux-gnu/debug/libislet_sdk.so"
TARGET_LIB="$ISLET/out/x86_64-unknown-linux-gnu/debug/libislet_sdk.a"
bitboom marked this conversation as resolved.
Show resolved Hide resolved

# Sync islet
cd "$HERE"
wget https://github.com/Samsung/islet/archive/refs/tags/certifier-v1.0.1-beta.tar.gz
tar xf certifier-v1.0.1-beta.tar.gz
rm -rf "$ISLET"
mv islet-certifier-v1.0.1-beta "$ISLET"
git clone https://github.com/islet-project/islet.git "$ISLET"
cd "$ISLET"
git submodule update --init --depth 1 $ISLET/third-party/ciborium
git submodule update --init --depth 1 $ISLET/third-party/coset

# Install rust to build ISLET SDK
"$ISLET/scripts/deps/rust.sh"
Expand Down
Loading