Fixes

EnclaveGmpTest/.deps/EnclaveGmpTest_t.Po

 EnclaveGmpTest_t.o: EnclaveGmpTest_t.c EnclaveGmpTest_t.h \
- /opt/intel/sgxsdk/include/tlibc/stdint.h \
- /opt/intel/sgxsdk/include/tlibc/sys/stdint.h \
- /opt/intel/sgxsdk/include/tlibc/sys/cdefs.h \
- /opt/intel/sgxsdk/include/tlibc/sys/_types.h \
- /opt/intel/sgxsdk/include/tlibc/wchar.h \
- /opt/intel/sgxsdk/include/tlibc/stddef.h \
- /opt/intel/sgxsdk/include/sgx_edger8r.h \
- /opt/intel/sgxsdk/include/sgx_defs.h \
- /opt/intel/sgxsdk/include/sgx_error.h \
- /opt/intel/sgxsdk/include/sgx_eid.h /opt/gmp/6.1.2/include/sgx_tgmp.h \
- /opt/intel/sgxsdk/include/tlibc/limits.h \
- /opt/intel/sgxsdk/include/tlibc/sys/limits.h \
- /opt/intel/sgxsdk/include/tlibc/stdlib.h \
- /opt/intel/sgxsdk/include/sgx_trts.h \
- /opt/intel/sgxsdk/include/sgx_lfence.h \
- /opt/intel/sgxsdk/include/tlibc/errno.h \
- /opt/intel/sgxsdk/include/tlibc/mbusafecrt.h \
- /opt/intel/sgxsdk/include/tlibc/string.h \
- /opt/intel/sgxsdk/include/tlibc/stdarg.h
+ /d/sgxd/sgx-sdk-build/sgxsdk/include/tlibc/stdint.h \
+ /d/sgxd/sgx-sdk-build/sgxsdk/include/tlibc/sys/stdint.h \
+ /d/sgxd/sgx-sdk-build/sgxsdk/include/tlibc/sys/cdefs.h \
+ /d/sgxd/sgx-sdk-build/sgxsdk/include/tlibc/sys/_types.h \
+ /d/sgxd/sgx-sdk-build/sgxsdk/include/tlibc/wchar.h \
+ /d/sgxd/sgx-sdk-build/sgxsdk/include/tlibc/stddef.h \
+ /d/sgxd/sgx-sdk-build/sgxsdk/include/sgx_edger8r.h \
+ /d/sgxd/sgx-sdk-build/sgxsdk/include/sgx_defs.h \
+ /d/sgxd/sgx-sdk-build/sgxsdk/include/sgx_error.h \
+ /d/sgxd/sgx-sdk-build/sgxsdk/include/sgx_eid.h \
+ /d/sgxd/tgmp-build/include/sgx_tgmp.h \
+ /d/sgxd/sgx-sdk-build/sgxsdk/include/tlibc/limits.h \
+ /d/sgxd/sgx-sdk-build/sgxsdk/include/tlibc/sys/limits.h \
+ /d/sgxd/sgx-sdk-build/sgxsdk/include/tlibc/stdlib.h \
+ /d/sgxd/sgx-sdk-build/sgxsdk/include/sgx_trts.h \
+ /d/sgxd/sgx-sdk-build/sgxsdk/include/sgx_lfence.h \
+ /d/sgxd/sgx-sdk-build/sgxsdk/include/tlibc/errno.h \
+ /d/sgxd/sgx-sdk-build/sgxsdk/include/tlibc/mbusafecrt.h \
+ /d/sgxd/sgx-sdk-build/sgxsdk/include/tlibc/string.h \
+ /d/sgxd/sgx-sdk-build/sgxsdk/include/tlibc/stdarg.h
 
 EnclaveGmpTest_t.h:
 
-/opt/intel/sgxsdk/include/tlibc/stdint.h:
+/d/sgxd/sgx-sdk-build/sgxsdk/include/tlibc/stdint.h:
 
-/opt/intel/sgxsdk/include/tlibc/sys/stdint.h:
+/d/sgxd/sgx-sdk-build/sgxsdk/include/tlibc/sys/stdint.h:
 
-/opt/intel/sgxsdk/include/tlibc/sys/cdefs.h:
+/d/sgxd/sgx-sdk-build/sgxsdk/include/tlibc/sys/cdefs.h:
 
-/opt/intel/sgxsdk/include/tlibc/sys/_types.h:
+/d/sgxd/sgx-sdk-build/sgxsdk/include/tlibc/sys/_types.h:
 
-/opt/intel/sgxsdk/include/tlibc/wchar.h:
+/d/sgxd/sgx-sdk-build/sgxsdk/include/tlibc/wchar.h:
 
-/opt/intel/sgxsdk/include/tlibc/stddef.h:
+/d/sgxd/sgx-sdk-build/sgxsdk/include/tlibc/stddef.h:
 
-/opt/intel/sgxsdk/include/sgx_edger8r.h:
+/d/sgxd/sgx-sdk-build/sgxsdk/include/sgx_edger8r.h:
 
-/opt/intel/sgxsdk/include/sgx_defs.h:
+/d/sgxd/sgx-sdk-build/sgxsdk/include/sgx_defs.h:
 
-/opt/intel/sgxsdk/include/sgx_error.h:
+/d/sgxd/sgx-sdk-build/sgxsdk/include/sgx_error.h:
 
-/opt/intel/sgxsdk/include/sgx_eid.h:
+/d/sgxd/sgx-sdk-build/sgxsdk/include/sgx_eid.h:
 
-/opt/gmp/6.1.2/include/sgx_tgmp.h:
+/d/sgxd/tgmp-build/include/sgx_tgmp.h:
 
-/opt/intel/sgxsdk/include/tlibc/limits.h:
+/d/sgxd/sgx-sdk-build/sgxsdk/include/tlibc/limits.h:
 
-/opt/intel/sgxsdk/include/tlibc/sys/limits.h:
+/d/sgxd/sgx-sdk-build/sgxsdk/include/tlibc/sys/limits.h:
 
-/opt/intel/sgxsdk/include/tlibc/stdlib.h:
+/d/sgxd/sgx-sdk-build/sgxsdk/include/tlibc/stdlib.h:
 
-/opt/intel/sgxsdk/include/sgx_trts.h:
+/d/sgxd/sgx-sdk-build/sgxsdk/include/sgx_trts.h:
 
-/opt/intel/sgxsdk/include/sgx_lfence.h:
+/d/sgxd/sgx-sdk-build/sgxsdk/include/sgx_lfence.h:
 
-/opt/intel/sgxsdk/include/tlibc/errno.h:
+/d/sgxd/sgx-sdk-build/sgxsdk/include/tlibc/errno.h:
 
-/opt/intel/sgxsdk/include/tlibc/mbusafecrt.h:
+/d/sgxd/sgx-sdk-build/sgxsdk/include/tlibc/mbusafecrt.h:
 
-/opt/intel/sgxsdk/include/tlibc/string.h:
+/d/sgxd/sgx-sdk-build/sgxsdk/include/tlibc/string.h:
 
-/opt/intel/sgxsdk/include/tlibc/stdarg.h:
+/d/sgxd/sgx-sdk-build/sgxsdk/include/tlibc/stdarg.h:

EnclaveGmpTest/Makefile.am

@@ -63,7 +63,7 @@ ENCLAVE_KEY=$(ENCLAVE)_private.pem
 ## Additional Automake flags needed to build the enclave.
 ##
 
-AM_CPPFLAGS += $(TGMP_CPPFLAGS)
+AM_CPPFLAGS += $(TGMP_CPPFLAGS) -I../libff  -I../sgx-sdk-build/sgxsdk/include/libcxx 
 AM_CXXFLAGS += -fno-builtin
 
 
@@ -83,7 +83,9 @@ CLEANFILES+= EnclaveGmpTest_t.c EnclaveGmpTest_t.h
 ## target name (i.e., $(ENCLAVE)_SOURCES will not work).
 
 EnclaveGmpTest_SOURCES = EnclaveGmpTest_t.c EnclaveGmpTest_t.h \
-	EnclaveGmpTest.c $(ENCLAVE_KEY) $(ENCLAVE_CONFIG)
+	EnclaveGmpTest.c \
+        EnclaveGmpTest.c BLSUtils.cpp  ../libff/libff/algebra/curves/alt_bn128/alt_bn128_init.cpp \
+                ../libff/libff/libff/algebra/curves/alt_bn128/alt_bn128_g1.cpp $(ENCLAVE_KEY) $(ENCLAVE_CONFIG)
 
 
 ## Add additional linker flags to AM_LDFLAGS here. Don't put 

Makefile.am

@@ -45,7 +45,7 @@ EnclaveGmpTest.edl: EnclaveGmpTest/EnclaveGmpTest.edl
 ## AM_CFLAGS = 
 ## AM_CXXFLAGS = 
 
-AM_CPPFLAGS += -DSKALE_SGX=1 -DBINARY_OUTPUT=1 -IlibBLS -Ilibff -fno-builtin-memset $(GMP_CPPFLAGS)
+AM_CPPFLAGS += -DSKALE_SGX=1 -DBINARY_OUTPUT=1  -Ilibff -fno-builtin-memset $(GMP_CPPFLAGS)
 
 ## Additional targets to remove with 'make clean'. You must list
 ## any edger8r generated files here.
@@ -63,13 +63,7 @@ bin_PROGRAMS = sgxgmpmath sgxgmppi
 ## have to be explicitly listed.
 
 COMMON_SRC = sgx_stub.c sgx_detect_linux.c create_enclave.c oc_alloc.c
-COMMON_ENCLAVE_SRC = EnclaveGmpTest_u.c EnclaveGmpTest_u.h \
-                libBLS/bls/BLSPrivateKey.cpp \
-                libBLS/bls/BLSSignature.cpp \
-                libBLS/bls/BLSutils.cpp \
-                libff/libff/algebra/curves/alt_bn128/alt_bn128_init.cpp \
-                libff/libff/algebra/curves/alt_bn128/alt_bn128_g1.cpp 
- 
+COMMON_ENCLAVE_SRC = EnclaveGmpTest_u.c EnclaveGmpTest_u.h 
 
 sgxgmpmath_SOURCES = sgxgmpmath.c $(COMMON_SRC)
 nodist_sgxgmpmath_SOURCES = $(COMMON_ENCLAVE_SRC)

compile

-/usr/share/automake-1.16/compile
\ No newline at end of file
+/usr/share/automake-1.15/compile
\ No newline at end of file

config.status

@@ -421,7 +421,7 @@ $config_commands
 
 Report bugs to <john.p.mechalas@intel.com>."
 
-ac_cs_config="'--with-trusted-gmpdir=/opt/gmp/6.1.2' '--with-gmpdir=/d/gmp-build/'"
+ac_cs_config=""
 ac_cs_version="\
 SGX GMP Test config.status 1.0
 configured by ./configure, generated by GNU Autoconf 2.69,
@@ -435,7 +435,7 @@ ac_pwd='/d/sgxd'
 srcdir='.'
 INSTALL='/usr/bin/install -c'
 MKDIR_P='/bin/mkdir -p'
-AWK='mawk'
+AWK='gawk'
 test -n "$AWK" || AWK=awk
 # The default lists apply if the user does not specify any file.
 ac_need_defaults=:
@@ -502,7 +502,7 @@ if $ac_cs_silent; then
 fi
 
 if $ac_cs_recheck; then
-  set X /bin/bash './configure'  '--with-trusted-gmpdir=/opt/gmp/6.1.2' '--with-gmpdir=/d/gmp-build/' $ac_configure_extra_args --no-create --no-recursion
+  set X /bin/bash './configure'  $ac_configure_extra_args --no-create --no-recursion
   shift
   $as_echo "running CONFIG_SHELL=/bin/bash $*" >&6
   CONFIG_SHELL='/bin/bash'
@@ -600,10 +600,10 @@ S["am__EXEEXT_FALSE"]=""
 S["am__EXEEXT_TRUE"]="#"
 S["LTLIBOBJS"]=""
 S["LIBOBJS"]=""
-S["TGMP_LDFLAGS"]="-L/opt/gmp/6.1.2/lib"
-S["TGMP_CPPFLAGS"]="-I/opt/gmp/6.1.2/include"
-S["GMP_LDFLAGS"]="-L/d/gmp-build//lib"
-S["GMP_CPPFLAGS"]="-I/d/gmp-build//include"
+S["TGMP_LDFLAGS"]="-L/d/sgxd/tgmp-build/lib"
+S["TGMP_CPPFLAGS"]="-I/d/sgxd/tgmp-build/include -I/d/sgxd/gmp-build/include"
+S["GMP_LDFLAGS"]="-L/d/sgxd/gmp-build/lib"
+S["GMP_CPPFLAGS"]="-I/d/sgxd/gmp-build/include -I/d/sgxd/tgmp-build/include"
 S["SGX_HW_SIM_FALSE"]=""
 S["SGX_HW_SIM_TRUE"]="#"
 S["ENCLAVE_RELEASE_SIGN_FALSE"]=""
@@ -621,10 +621,10 @@ S["SGXSSL_LIBDIR"]="/opt/intel/sgxssl/lib64"
 S["SGXSSL_INCDIR"]="/opt/intel/sgxssl/include"
 S["SGXSSL"]="/opt/intel/sgxssl"
 S["enclave_libdir"]="${exec_prefix}/libexec"
-S["SGXSDK_BINDIR"]="/opt/intel/sgxsdk/bin/x64"
-S["SGXSDK_LIBDIR"]="/opt/intel/sgxsdk/lib64"
-S["SGXSDK_INCDIR"]="/opt/intel/sgxsdk/include"
-S["SGXSDK"]="/opt/intel/sgxsdk"
+S["SGXSDK_BINDIR"]="/d/sgxd/sgx-sdk-build/sgxsdk/bin/x64"
+S["SGXSDK_LIBDIR"]="/d/sgxd/sgx-sdk-build/sgxsdk/lib64"
+S["SGXSDK_INCDIR"]="/d/sgxd/sgx-sdk-build/sgxsdk/include"
+S["SGXSDK"]="/d/sgxd/sgx-sdk-build/sgxsdk"
 S["SGX_DEBUG_FLAGS"]=""
 S["ENCLAVE_SIGN_TARGET"]="signed_enclave_dev"
 S["LIBS_HW_SIMU"]=""
@@ -667,7 +667,7 @@ S["am__tar"]="$${TAR-tar} chof - \"$$tardir\""
 S["AMTAR"]="$${TAR-tar}"
 S["am__leading_dot"]="."
 S["SET_MAKE"]=""
-S["AWK"]="mawk"
+S["AWK"]="gawk"
 S["mkdir_p"]="$(MKDIR_P)"
 S["MKDIR_P"]="/bin/mkdir -p"
 S["INSTALL_STRIP_PROGRAM"]="$(install_sh) -c -s"

depcomp

-/usr/share/automake-1.16/depcomp
\ No newline at end of file
+/usr/share/automake-1.15/depcomp
\ No newline at end of file

install-sh

-/usr/share/automake-1.16/install-sh
\ No newline at end of file
+/usr/share/automake-1.15/install-sh
\ No newline at end of file

missing

-/usr/share/automake-1.16/missing
\ No newline at end of file
+/usr/share/automake-1.15/missing
\ No newline at end of file

scripts/build.py

@@ -66,13 +66,9 @@ GMP_BUILD_DIR = topDir + "/gmp-build"
 TGMP_BUILD_DIR = topDir + "/tgmp-build"
 SDK_DIR = topDir + "/sgx-sdk-build"
 
-AUTOMAKE_DIR = "/usr/share/automake-1.16"
-
-
+AUTOMAKE_DIR = "/usr/share/automake-1.15"
 
 if not os.path.isdir(AUTOMAKE_DIR):
-    AUTOMAKE_DIR = "/usr/share/automake-1.15"
-    if not os.path.isdir(AUTOMAKE_DIR):
     raise Exception("Could not find " + AUTOMAKE_DIR)