Skip to content

updating the SGX build #488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion SGX_Linux/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ 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

# 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

exit 0
14 changes: 13 additions & 1 deletion SGX_Linux/sgx_t.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand All @@ -60,6 +61,17 @@ 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 -masm=intel
#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 \
Expand Down
14 changes: 13 additions & 1 deletion SGX_Linux/sgx_u.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand All @@ -52,6 +53,17 @@ 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 -masm=intel
#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 \
Expand Down