Browse Source

Modified paths to protobufRW files and edited makefile to take in the path to the modified sgxsdk through the SGX_SDK_TRTS_MODIFIED env var.

Miti Mazmudar 4 years ago
parent
commit
19e463133f
3 changed files with 4 additions and 4 deletions
  1. 2 2
      Makefile
  2. 1 1
      ProtobufMessageRW.cpp
  3. 1 1
      include/ProtobufMessageRW.h

+ 2 - 2
Makefile

@@ -47,10 +47,10 @@ ProtobufAutogenerated/%.o: ProtobufAutogenerated/%.cpp
 	#-I/usr/lib/jvm/java-8-openjdk-amd64/include/ -I/usr/lib/jvm/java-8-openjdk-amd64/include/linux/
 
 crypto.o: crypto.cpp 
-	${CXX} -I${Openssl_Path}/include ${CXX_FLAGS} -c $^ -o $@
+	${CXX} ${CXX_FLAGS} -c $^ -o $@
 
 verifier:  systemMain.o DeploymentStageLogic.o LAInitiator/LA.o LAInitiator/Transforms.o PostLA/PostLAMessaging.o ProtobufAutogenerated/ProtobufLAMessages.pb.o ProtobufMessageRW.o crypto.o
-	${CXX} -Wl,--no-undefined  systemMain.o DeploymentStageLogic.o LAInitiator/LA.o LAInitiator/Transforms.o PostLA/PostLAMessaging.o ProtobufAutogenerated/ProtobufLAMessages.pb.o ProtobufMessageRW.o crypto.o  -L${Openssl_Path}/lib -lcrypto -lssl -L./ -l$(Service_Library_Name) -l$(Crypto_Library_Name) -L/home/m2mazmud/linux-sgx-trts-modified/build/linux -lsgx_tstdc -lsgx_trts ${LD_FLAGS} -lprotobuf  -o $@
+	${CXX} -Wl,--no-undefined  systemMain.o DeploymentStageLogic.o LAInitiator/LA.o LAInitiator/Transforms.o PostLA/PostLAMessaging.o ProtobufAutogenerated/ProtobufLAMessages.pb.o ProtobufMessageRW.o crypto.o -lcrypto -lssl -L./ -l$(Service_Library_Name) -l$(Crypto_Library_Name) -L$(SGX_SDK_TRTS_MODIFIED) -lsgx_tstdc -lsgx_trts ${LD_FLAGS} -lprotobuf  -o $@
 #-L/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server -ljvm  
 #-L~/linux-sgx-trts-modified/build/linux -lsgx_tstdc -lsgx_trts ${LD_FLAGS} -o $@
 

+ 1 - 1
ProtobufMessageRW.cpp

@@ -1 +1 @@
-../commonVerifierPHPfiles/ProtobufMessageRW.cpp
+../dhmsgs_proto_defs/ProtobufMessageRW.cpp

+ 1 - 1
include/ProtobufMessageRW.h

@@ -1 +1 @@
-../../commonVerifierPHPfiles/header_files/ProtobufMessageRW.h
+../../dhmsgs_proto_defs/ProtobufMessageRW.h