|
@@ -74,6 +74,12 @@ endif
|
|
|
#PHPTrustLib_Include_Paths := -I$(SGX_SDK)/include -I$(SGX_SDK)/include/tlibc -I$(SGX_SDK)/include/libcxx -I$(SGX_SDK)/include/epid -I./Include
|
|
|
#PHPTrustLib_Compile_Flags := $(SGX_COMMON_CFLAGS) -nostdinc -fvisibility=hidden -fpie -fstack-protector $(TrustLib_Include_Paths)
|
|
|
#PHPTrustLib_Compile_Cxx_Flags := -std=c++11 -nostdinc++
|
|
|
+OPENSSL_LIBRARY_PATH := /home/m2mazmud/old_stuff/intel-sgx-ssl/Linux/package/lib64/
|
|
|
+OpenSSL_Crypto_Library_Name := sgx_tsgxssl_crypto
|
|
|
+SGXSSL_Library_Name := sgx_tsgxssl
|
|
|
+SgxSSL_Link_Libraries := -L$(OPENSSL_LIBRARY_PATH) -Wl,--whole-archive -l$(SGXSSL_Library_Name) -Wl,--no-whole-archive -l$(OpenSSL_Crypto_Library_Name)
|
|
|
+#Security_Link_Flags := -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -pie
|
|
|
+OPENSSL_INCLUDES := /home/m2mazmud/old_stuff/intel-sgx-ssl/Linux/package/include
|
|
|
|
|
|
|
|
|
|
|
@@ -114,7 +120,8 @@ else
|
|
|
App_Compile_Flags += -DNDEBUG -UEDEBUG -UDEBUG
|
|
|
endif
|
|
|
|
|
|
-App_Link_Flags := $(SGX_COMMON_CFLAGS) -L$(SGX_LIBRARY_PATH) -l$(Urts_Library_Name) -L. -lpthread -lprotobuf
|
|
|
+#App_Link_Flags := $(SGX_COMMON_CFLAGS) -L$(SGX_LIBRARY_PATH) -l$(Urts_Library_Name) -L. -lpthread -lprotobuf
|
|
|
+App_Link_Flags := $(SGX_COMMON_CFLAGS) $(Security_Link_Flags) -L$(SGX_LIBRARY_PATH) -l$(Urts_Library_Name) -lsgx_uae_service -L$(OPENSSL_LIBRARY_PATH) -lsgx_usgxssl -lpthread -lprotobuf
|
|
|
|
|
|
ifneq ($(SGX_MODE), HW)
|
|
|
App_Link_Flags += -lsgx_uae_service_sim
|
|
@@ -139,7 +146,7 @@ endif
|
|
|
Crypto_Library_Name := sgx_tcrypto
|
|
|
|
|
|
Enclave_Cpp_Files_2 := $(wildcard Decryptor/*.cpp)
|
|
|
-Enclave_Include_Paths := -I$(SGX_SDK)/include -I$(SGX_SDK)/include/tlibc -I$(SGX_SDK)/include/libcxx -I./LocalAttestationCode -I./Include
|
|
|
+Enclave_Include_Paths := -I$(SGX_SDK)/include -I$(SGX_SDK)/include/tlibc -I$(SGX_SDK)/include/libcxx -I./LocalAttestationCode -I./Include -I$(OPENSSL_INCLUDES)
|
|
|
|
|
|
CC_BELOW_4_9 := $(shell expr "`$(CC) -dumpversion`" \< "4.9")
|
|
|
ifeq ($(CC_BELOW_4_9), 1)
|
|
@@ -157,11 +164,12 @@ Enclave_Compile_Flags += $(Enclave_Include_Paths)
|
|
|
# Use `--start-group' and `--end-group' to link these libraries.
|
|
|
# Do NOT move the libraries linked with `--start-group' and `--end-group' within `--whole-archive' and `--no-whole-archive' options.
|
|
|
# Otherwise, you may get some undesirable errors.
|
|
|
-Common_Enclave_Link_Flags := $(SGX_COMMON_CFLAGS) -Wl,--no-undefined -nostdlib -nodefaultlibs -nostartfiles -L$(SGX_LIBRARY_PATH) \
|
|
|
+Common_Enclave_Link_Flags := $(SGX_COMMON_CFLAGS) -Wl,--no-undefined -nostdlib -nodefaultlibs -nostartfiles \
|
|
|
+ -Wl,--verbose \
|
|
|
-Wl,--whole-archive -l$(Trts_Library_Name) -Wl,--no-whole-archive \
|
|
|
- -Wl,--start-group -L. -lLocalAttestation_Trusted -lsgx_tstdc -lsgx_tcxx -l$(Crypto_Library_Name) -l$(Service_Library_Name) -Wl,--end-group \
|
|
|
- -Wl,-Bstatic -Wl,-Bsymbolic -Wl,--no-undefined \
|
|
|
- -Wl,-pie,-eenclave_entry -Wl,--export-dynamic \
|
|
|
+ -Wl,--start-group $(Security_Link_Flags) $(SgxSSL_Link_Libraries) -L$(SGX_LIBRARY_PATH) -L. -lLocalAttestation_Trusted -lsgx_tstdc -lsgx_tcxx -l$(Crypto_Library_Name) -l$(Service_Library_Name) -Wl,--end-group \
|
|
|
+ -Wl,-Bstatic -Wl,-Bsymbolic \
|
|
|
+ -Wl,-pie,-eenclave_entry -Wl,--export-dynamic \
|
|
|
-Wl,--defsym,__ImageBase=0 -Wl,--gc-sections
|
|
|
Decryptor_Link_Flags := $(Common_Enclave_Link_Flags) -Wl,--version-script=$(Decryptor_Version_Script)
|
|
|
Enclave_Cpp_Objects_2 := $(Enclave_Cpp_Files_2:.cpp=.o)
|
|
@@ -273,7 +281,7 @@ Decryptor/%.o: Decryptor/%.cpp
|
|
|
@echo "CXX <= $<"
|
|
|
|
|
|
Decryptor.so: Decryptor/Decryptor_t.o $(Enclave_Cpp_Objects_2) $(Trust_Lib_Name)
|
|
|
- @$(CXX) -Wl,--no-undefined Decryptor/Decryptor_t.o $(Enclave_Cpp_Objects_2) -o $@ $(Decryptor_Link_Flags)
|
|
|
+ @$(CXX) Decryptor/Decryptor_t.o $(Enclave_Cpp_Objects_2) -o $@ $(Decryptor_Link_Flags)
|
|
|
@echo "LINK => $@"
|
|
|
|
|
|
$(Enclave_Name_2): Decryptor.so
|