Browse Source

Not working commit: hangs/crashes

dettanym 5 years ago
parent
commit
1d05c7deb0
4 changed files with 4 additions and 4 deletions
  1. 2 2
      Makefile
  2. 1 1
      SgxCrypto.cpp
  3. 1 1
      include/SgxCrypto.h
  4. BIN
      verifier

+ 2 - 2
Makefile

@@ -16,7 +16,7 @@ protobuf_obj := $(patsubst %.cpp,%.o,$(wildcard Protobuf*))
 system_obj := $(patsubst %.cpp,%.o,$(wildcard system*))
 OBJECTS := systemMain.o systemIpc.o systemSealerWrapper.o SgxCrypto.o SgxSealer.o SgxLAInitiator.o ${sgx_protobuf_obj} ${protobuf_obj} #$(system_obj) $(sgx_only_obj) $(sgx_protobuf_obj) $(protobuf_obj)
 
-SGX_SDK ?= /opt/intel/sgxsdk#/home/m2mazmud/sgx2.1_installation/sgxsdk
+SGX_SDK := /home/m2mazmud/sgx2.1_installation/sgxsdk
 SGX_COMMON_CFLAGS := -m64
 SGX_LIBRARY_PATH := $(SGX_SDK)/lib64
 Trts_Library_Name := sgx_trts
@@ -67,4 +67,4 @@ system%.o: system%.cpp
 
 verifier:  systemMain.o systemIpc.o systemSealerWrapper.o  SgxSealer.o SgxLAInitiator.o ${sgx_protobuf_obj} ${protobuf_obj}
 #	echo $(system_obj)
-	${CXX} ${CXX_FLAGS} -Wl,--no-undefined systemMain.o systemIpc.o systemSealerWrapper.o SgxSealer.o SgxLAInitiator.o ${sgx_protobuf_obj} -L./ -Wl,--whole-archive -l$(Trts_Library_Name) -Wl,--no-whole-archive  -L$(SGX_LIBRARY_PATH)  -l$(Service_Library_Name) -l$(Crypto_Library_Name) -l$(Uae_Library_Name) -lsgx_tstdc -lsgx_urts ${protobuf_obj} -lprotobuf -Wl,--verbose -o $@
+	${CXX} ${CXX_FLAGS} systemMain.o systemIpc.o systemSealerWrapper.o SgxSealer.o SgxLAInitiator.o ${sgx_protobuf_obj} -L./ -Wl,--whole-archive -l$(Trts_Library_Name) -Wl,--no-whole-archive  -L$(SGX_LIBRARY_PATH)  -l$(Service_Library_Name) -l$(Crypto_Library_Name) -l$(Uae_Library_Name) -lsgx_tstdc -lsgx_urts ${protobuf_obj} -lprotobuf -lsgx_tstdcxx -Wl,--verbose -o $@

+ 1 - 1
SgxCrypto.cpp

@@ -1,7 +1,7 @@
 #include "stdlib.h"
 //#include "string"
 #include "sgx_tcrypto.h"
-int create_rsa_key_pair_for_signing_manifest(/*std::string& priv_key, std::string& pub_key*/) 
+uint32_t create_rsa_key_pair_for_signing_manifest(/*std::string& priv_key, std::string& pub_key*/) 
 {
 	uint32_t ret_sgx;
 	uint8_t* n=(uint8_t*)malloc(384); 

+ 1 - 1
include/SgxCrypto.h

@@ -1 +1 @@
-int create_rsa_key_pair_for_signing_manifest();
+uint32_t create_rsa_key_pair_for_signing_manifest();

BIN
verifier