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

Fix LA demo to align with occlum command

Browse Source
This commit is contained in:
Hui, Chunyang 2020-08-14 17:38:05 +00:00 committed by Tate, Hongliang Tian
parent faf9c9d14e
commit 122a66289c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
demos/local_attestation/AppInitiator/app.cpp
View File

@ -13,7 +13,7 @@
#include "EnclaveInitiator_u.h" #include "EnclaveInitiator_u.h"
#define ENCLAVE_INITIATOR_NAME "./build/libenclave_initiator.signed.so" #define ENCLAVE_INITIATOR_NAME "./libenclave_initiator.signed.so"
pthread_t thread; pthread_t thread;
sgx_enclave_id_t initiator_enclave_id = 0; 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); printf("succeed to load enclave %s\n", ENCLAVE_INITIATOR_NAME);
occlum_pal_attr_t pal_attr = OCCLUM_PAL_ATTR_INITVAL; occlum_pal_attr_t attr = OCCLUM_PAL_ATTR_INITVAL;
pal_attr.log_level = (const char *) getenv("OCCLUM_LOG_LEVEL"); attr.log_level = (const char *) getenv("OCCLUM_LOG_LEVEL");
if (occlum_pal_init(&attr) < 0) { if (occlum_pal_init(&attr) < 0) {
return EXIT_FAILURE; return EXIT_FAILURE;
} }

6
demos/local_attestation/Makefile
View File

@ -20,7 +20,7 @@ occlum_instance: build_src
cp $(OPENSSL)/libcrypto.so.1.1 image/lib/ && \ cp $(OPENSSL)/libcrypto.so.1.1 image/lib/ && \
cp $(CUR_DIR)/DiffieHellmanLibrary/libecdh.so image/lib/ && \ cp $(CUR_DIR)/DiffieHellmanLibrary/libecdh.so image/lib/ && \
occlum build occlum build
@cp -r occlum_instance/.occlum .occlum @cp -t occlum_instance $(APP) $(BUILD_DIR)/libenclave_initiator.signed.so
build_src: build_src:
@$(MAKE) --no-print-directory -C DiffieHellmanLibrary @$(MAKE) --no-print-directory -C DiffieHellmanLibrary
@ -29,8 +29,8 @@ build_src:
@$(MAKE) --no-print-directory -C EnclaveInitiator @$(MAKE) --no-print-directory -C EnclaveInitiator
test: build_src test: build_src
LD_LIBRARY_PATH=$(BUILD_DIR):$(SGX_SDK)/sdk_libs RUST_BACKTRACE=1 \ cd occlum_instance && LD_LIBRARY_PATH=../$(BUILD_DIR):$(SGX_SDK)/sdk_libs RUST_BACKTRACE=1 \
./$(APP) ./appinitiator
clean: clean:
@$(MAKE) --no-print-directory -C AppInitiator clean @$(MAKE) --no-print-directory -C AppInitiator clean