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

Makefile build flag is not passed inside enclave-runtime #3138

Merged
merged 3 commits into from
Oct 20, 2024
Merged

Makefile build flag is not passed inside enclave-runtime #3138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c37d66
build flag is not passed inside enclave-runtime; add some log info
BillyWooo Oct 18, 2024
6151b7a
Merge remote-tracking branch 'origin/dev' into p-1105-sgxsgx_error_en…
BillyWooo Oct 18, 2024
025431f
typo
BillyWooo Oct 19, 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
2 changes: 1 addition & 1 deletion tee-worker/bitacross/service/src/enclave/tls_ra.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ pub fn enclave_run_state_provisioning_server<E: TlsRemoteAttestation>(
loop {
match listener.accept() {
Ok((socket, addr)) => {
info!("[MU-RA-Server] a worker at {} is requesting key provisiong", addr);
info!("[MU-RA-Server] a worker at {} is requesting key provisioning", addr);
// there is some race condition, lets wait until local state gets updated (signers are registered and updated locally through indirect calls)
std::thread::sleep(Duration::from_secs(3));
let result = enclave_api.run_state_provisioning_server(
Expand Down
2 changes: 1 addition & 1 deletion tee-worker/identity/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ endif
enclave:
@echo
@echo "Building the enclave"
$(MAKE) -C ./enclave-runtime/
$(MAKE) -C ./enclave-runtime/ RA_METHOD=$(RA_METHOD) WORKER_DEV=$(WORKER_DEV)

.git/hooks/pre-commit: .githooks/pre-commit
@echo "Installing git hooks"
Expand Down
4 changes: 4 additions & 0 deletions tee-worker/identity/enclave-runtime/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ ifeq ($(WORKER_DEV), 1)
ADDITIONAL_FEATURES := $(ADDITIONAL_FEATURES),development
endif

ifeq ($(RA_METHOD), dcap)
ADDITIONAL_FEATURES := $(ADDITIONAL_FEATURES),dcap
endif

ifeq ($(WORKER_ENV_DATA_PROVIDERS_CONFIG), 1)
ADDITIONAL_FEATURES := $(ADDITIONAL_FEATURES),env-data-providers-config
endif
Expand Down
5 changes: 5 additions & 0 deletions tee-worker/identity/enclave-runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,11 @@ pub unsafe extern "C" fn init(
}
);

#[cfg(feature = "dcap")]
info!(" DCAP is enabled within enclave");
#[cfg(not(feature = "dcap"))]
info!(" DCAP is disabled within enclave");

let mu_ra_url =
match String::decode(&mut slice::from_raw_parts(mu_ra_addr, mu_ra_addr_size as usize))
.map_err(Error::Codec)
Expand Down
2 changes: 1 addition & 1 deletion tee-worker/identity/service/src/enclave/tls_ra.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ pub fn enclave_run_state_provisioning_server<E: TlsRemoteAttestation>(
loop {
match listener.accept() {
Ok((socket, addr)) => {
info!("[MU-RA-Server] a worker at {} is requesting key provisiong", addr);
info!("[MU-RA-Server] a worker at {} is requesting key provisioning", addr);

let result = enclave_api.run_state_provisioning_server(
socket.as_raw_fd(),
Expand Down
Loading