Merge pull request #488 from JacobBarthelmeh/sgx

updating the SGX build
pull/521/head
David Garske 2025-08-26 16:04:37 -07:00 committed by GitHub
commit ab5627e72d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 35 additions and 3 deletions

View File

@ -5,6 +5,12 @@ if [ -z $1 ]; then
exit 1
fi
make SGX_MODE=HW SGX_PRERELEASE=1 SGX_WOLFSSL_LIB=${1}IDE/LINUX-SGX/ WOLFSSL_ROOT=${1} SGX_DEBUG=0 HAVE_WOLFSSL_TEST=1 HAVE_WOLFSSL_BENCHMARK=1 HAVE_WOLFSSL_SP=1
# Build without assembly optimizations
#make SGX_MODE=HW SGX_PRERELEASE=1 SGX_WOLFSSL_LIB=${1}IDE/LINUX-SGX/ WOLFSSL_ROOT=${1} SGX_DEBUG=0 HAVE_WOLFSSL_TEST=1 HAVE_WOLFSSL_BENCHMARK=1 HAVE_WOLFSSL_SP=1 clean
#make SGX_MODE=HW SGX_PRERELEASE=1 SGX_WOLFSSL_LIB=${1}IDE/LINUX-SGX/ WOLFSSL_ROOT=${1} SGX_DEBUG=0 HAVE_WOLFSSL_TEST=1 HAVE_WOLFSSL_BENCHMARK=1 HAVE_WOLFSSL_SP=1
# Build with assembly optimizations
make SGX_MODE=HW SGX_PRERELEASE=1 SGX_WOLFSSL_LIB=${1}IDE/LINUX-SGX/ WOLFSSL_ROOT=${1} SGX_DEBUG=0 HAVE_WOLFSSL_TEST=1 HAVE_WOLFSSL_BENCHMARK=1 HAVE_WOLFSSL_SP=1 HAVE_WOLFSSL_ASSEMBLY=1 clean
make SGX_MODE=HW SGX_PRERELEASE=1 SGX_WOLFSSL_LIB=${1}IDE/LINUX-SGX/ WOLFSSL_ROOT=${1} SGX_DEBUG=0 HAVE_WOLFSSL_TEST=1 HAVE_WOLFSSL_BENCHMARK=1 HAVE_WOLFSSL_SP=1 HAVE_WOLFSSL_ASSEMBLY=1
exit 0

View File

@ -40,7 +40,8 @@ endif
Crypto_Library_Name := sgx_tcrypto
Wolfssl_C_Extra_Flags := -DWOLFSSL_SGX
Wolfssl_C_Extra_Flags := -DWOLFSSL_SGX\
-DWOLFSSL_CUSTOM_CONFIG
Wolfssl_Include_Paths := -I$(WOLFSSL_ROOT)/ \
-I$(WOLFSSL_ROOT)/wolfcrypt/
@ -60,6 +61,18 @@ ifeq ($(HAVE_WOLFSSL_BENCHMARK), 1)
Wolfssl_C_Extra_Flags += -DHAVE_WOLFSSL_BENCHMARK
endif
ifeq ($(HAVE_WOLFSSL_ASSEMBLY), 1)
Wolfssl_C_Extra_Flags += -DWOLFSSL_X86_64_BUILD\
-DWOLFSSL_AESNI\
-maes -mavx -mavx2 -msse4.2
#ifeq ($(HAVE_WOLFSSL_SP), 1)
Wolfssl_C_Extra_Flags += -DWOLFSSL_SP_X86_64_ASM\
-DWOLFSSL_SP_X86_64\
-DWOLFSSL_SP_ASM
#endif
endif
ifeq ($(HAVE_WOLFSSL_SP), 1)
Wolfssl_C_Extra_Flags += -DWOLFSSL_HAVE_SP_RSA \
-DWOLFSSL_HAVE_SP_DH \

View File

@ -38,7 +38,8 @@ else
Urts_Library_Name := sgx_urts
endif
Wolfssl_C_Extra_Flags := -DWOLFSSL_SGX
Wolfssl_C_Extra_Flags := -DWOLFSSL_SGX\
-DWOLFSSL_CUSTOM_CONFIG
Wolfssl_Include_Paths := -I$(WOLFSSL_ROOT)/ \
-I$(WOLFSSL_ROOT)/wolfcrypt/
@ -52,6 +53,18 @@ ifeq ($(HAVE_WOLFSSL_BENCHMARK), 1)
Wolfssl_C_Extra_Flags += -DHAVE_WOLFSSL_BENCHMARK
endif
ifeq ($(HAVE_WOLFSSL_ASSEMBLY), 1)
Wolfssl_C_Extra_Flags += -DWOLFSSL_X86_64_BUILD\
-DWOLFSSL_AESNI\
-maes -mavx -mavx2 -msse4.2
ifeq ($(HAVE_WOLFSSL_SP), 1)
Wolfssl_C_Extra_Flags += -DWOLFSSL_SP_X86_64_ASM\
-DWOLFSSL_SP_X86_64\
-DWOLFSSL_SP_ASM
endif
endif
ifeq ($(HAVE_WOLFSSL_SP), 1)
Wolfssl_C_Extra_Flags += -DWOLFSSL_HAVE_SP_RSA \
-DWOLFSSL_HAVE_SP_DH \