diff --git a/sgx-jvm/dependencies/root/usr/lib/x86_64-linux-gnu/libcurl.so.4 b/sgx-jvm/dependencies/root/usr/lib/x86_64-linux-gnu/libcurl.so.4 new file mode 120000 index 0000000000..373a73af27 --- /dev/null +++ b/sgx-jvm/dependencies/root/usr/lib/x86_64-linux-gnu/libcurl.so.4 @@ -0,0 +1 @@ +libcurl.so.4.4.0 \ No newline at end of file diff --git a/sgx-jvm/noop-enclave/CMakeLists.txt b/sgx-jvm/noop-enclave/CMakeLists.txt index 54430b8808..68f8747d21 100644 --- a/sgx-jvm/noop-enclave/CMakeLists.txt +++ b/sgx-jvm/noop-enclave/CMakeLists.txt @@ -17,10 +17,10 @@ set(ENCLAVE_SIGSTRUCT_PRETTY_HSM noop_enclave.sigstruct-pretty.hsm.txt) set(PRIVATE_KEY_NAME_OPENSSL selfsigning.pem) set(PUBLIC_KEY_NAME_OPENSSL selfsigning.public.pem) set(PUBLIC_KEY_NAME_HSM hsm.public.pem) -set(SIGN_HELPER ${PROJECT_SOURCE_DIR}/sign_helper/sign_helper) set(HSM_SGX_TOOL ${PROJECT_SOURCE_DIR}/../hsm-tool/build/libs/sgx-jvm/hsm-tool-1.0-SNAPSHOT.jar) set(DEPENDENCIES_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../dependencies/root) set(DEPENDENCIES_LIBRARY_PATH ${DEPENDENCIES_ROOT_DIR}/usr/lib/x86_64-linux-gnu CACHE STRING "") +set(SIGN_HELPER env LD_LIBRARY_PATH=${DEPENDENCIES_ROOT_DIR}/lib/x86_64-linux-gnu ${PROJECT_SOURCE_DIR}/sign_helper/sign_helper) set(NOOP_ENCLAVE noop_enclave_objects) set(SGX_SDK_INCLUDE ${SGX_SDK}/common/inc) @@ -184,6 +184,7 @@ set_target_properties(urtslib PROPERTIES IMPORTED_LOCATION ${SGX_LIBRARY_PATH}/l set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -g") link_directories(${DEPENDENCIES_LIBRARY_PATH}) add_executable(noop_test src/test.cpp ${GENERATED_RPC_DIR}/empty_u.c) target_include_directories(noop_test PUBLIC ${SGX_SDK_INCLUDE} ${GENERATED_RPC_DIR}) diff --git a/sgx-jvm/noop-enclave/IntelWhitelistFormInstructions.md b/sgx-jvm/noop-enclave/IntelWhitelistFormInstructions.md index 4efeb0a893..626f066000 100644 --- a/sgx-jvm/noop-enclave/IntelWhitelistFormInstructions.md +++ b/sgx-jvm/noop-enclave/IntelWhitelistFormInstructions.md @@ -23,7 +23,8 @@ will fail if there is already an existing production key in the HSM. To generate a production enclave signature === -This may be done from a dev machine with an SGX device. +This may be done from a dev machine with an SGX device. This step requires +the outer sgx-jvm to be built. To generate the signature and related files: