diff --git a/demos/local_attestation/AppInitiator/app.cpp b/demos/local_attestation/AppInitiator/app.cpp index f1da55bf..91e960e9 100644 --- a/demos/local_attestation/AppInitiator/app.cpp +++ b/demos/local_attestation/AppInitiator/app.cpp @@ -13,7 +13,7 @@ #include "EnclaveInitiator_u.h" -#define ENCLAVE_INITIATOR_NAME "./build/libenclave_initiator.signed.so" +#define ENCLAVE_INITIATOR_NAME "./libenclave_initiator.signed.so" pthread_t thread; sgx_enclave_id_t initiator_enclave_id = 0; @@ -37,8 +37,8 @@ int main(int argc, char *argv[]) { } printf("succeed to load enclave %s\n", ENCLAVE_INITIATOR_NAME); - occlum_pal_attr_t pal_attr = OCCLUM_PAL_ATTR_INITVAL; - pal_attr.log_level = (const char *) getenv("OCCLUM_LOG_LEVEL"); + occlum_pal_attr_t attr = OCCLUM_PAL_ATTR_INITVAL; + attr.log_level = (const char *) getenv("OCCLUM_LOG_LEVEL"); if (occlum_pal_init(&attr) < 0) { return EXIT_FAILURE; } diff --git a/demos/local_attestation/Makefile b/demos/local_attestation/Makefile index 47dd5f1e..49484666 100644 --- a/demos/local_attestation/Makefile +++ b/demos/local_attestation/Makefile @@ -20,7 +20,7 @@ occlum_instance: build_src cp $(OPENSSL)/libcrypto.so.1.1 image/lib/ && \ cp $(CUR_DIR)/DiffieHellmanLibrary/libecdh.so image/lib/ && \ occlum build - @cp -r occlum_instance/.occlum .occlum + @cp -t occlum_instance $(APP) $(BUILD_DIR)/libenclave_initiator.signed.so build_src: @$(MAKE) --no-print-directory -C DiffieHellmanLibrary @@ -29,8 +29,8 @@ build_src: @$(MAKE) --no-print-directory -C EnclaveInitiator test: build_src - LD_LIBRARY_PATH=$(BUILD_DIR):$(SGX_SDK)/sdk_libs RUST_BACKTRACE=1 \ - ./$(APP) + cd occlum_instance && LD_LIBRARY_PATH=../$(BUILD_DIR):$(SGX_SDK)/sdk_libs RUST_BACKTRACE=1 \ + ./appinitiator clean: @$(MAKE) --no-print-directory -C AppInitiator clean