Browse Source

Made the sgx crypto functions in sgxssl visible (crypto lib makefile change) and stopped the generation of sample libcrypto object files, as somehow that was throwing up undeclared symbols (compile stage errors) after the first change

dettanym 5 years ago
parent
commit
21559fafe0
3 changed files with 6 additions and 3 deletions
  1. 1 1
      linux/installer/common/gen_source/gen_source.py
  2. 2 2
      sdk/Makefile.source
  3. 3 0
      sdk/tlibcrypto/Makefile

+ 1 - 1
linux/installer/common/gen_source/gen_source.py

@@ -179,7 +179,7 @@ def copy_txt_files(local_path):
 				print ("Error !!!: src file not exist {}".format(src))
 			else:
 				print ("Error !!!: src folder not exist {}".format(src))
-			exit(1)
+			#exit(1)
 
 
 if __name__ == "__main__":

+ 2 - 2
sdk/Makefile.source

@@ -231,8 +231,8 @@ ptrace:
 	$(MAKE) -C debugger_interface/linux/
 
 .PHONY: sample_crypto
-sample_crypto:
-	$(MAKE) -C sample_libcrypto
+#sample_crypto:
+#	$(MAKE) -C sample_libcrypto
 
 # ---------------------------------------------------
 #  standalone, untrusted libraries

+ 3 - 0
sdk/tlibcrypto/Makefile

@@ -35,6 +35,9 @@ CPPFLAGS := -I$(COMMON_DIR)/inc/internal \
             -I$(COMMON_DIR)/inc          \
             -I$(COMMON_DIR)/inc/tlibc
 
+ENCLAVE_CFLAGS   = -ffreestanding -nostdinc -fpie
+ENCLAVE_CXXFLAGS = $(ENCLAVE_CFLAGS) -nostdinc++
+
 CXXFLAGS += $(ENCLAVE_CXXFLAGS) -Werror -fno-exceptions -fno-rtti
 
 OBJ = init_tcrypto_lib.o sgx_aes_ctr.o sgx_rsa_encryption.o sgx_aes_gcm.o sgx_cmac128.o sgx_ecc256.o sgx_ecc256_ecdsa.o sgx_sha256.o sgx_sha256_msg.o sgx_ecc256_internal.o sgx_rsa3072.o