SKALE-2794 add intel to third party

BLSCrypto.cpp

@@ -33,9 +33,9 @@
 #include "BLSPrivateKeyShareSGX.h"
 
 #include "sgxwallet_common.h"
-#include "create_enclave.h"
+#include "third_party/intel/create_enclave.h"
 #include "secure_enclave_u.h"
-#include "sgx_detect.h"
+#include "third_party/intel/sgx_detect.h"
 #include <gmp.h>
 #include <sgx_urts.h>
 

Makefile.am

@@ -70,7 +70,7 @@ COMMON_SRC = InvalidStateException.cpp  Exception.cpp InvalidArgumentException.c
              SGXWalletServer.cpp SGXRegistrationServer.cpp CSRManagerServer.cpp RPCException.cpp  BLSCrypto.cpp \
              ECDSACrypto.cpp \
              DKGCrypto.cpp ServerInit.cpp BLSPrivateKeyShareSGX.cpp LevelDB.cpp ServerDataChecker.cpp SEKManager.cpp \
-             sgx_stub.c sgx_detect_linux.c create_enclave.c oc_alloc.c \
+             third_party/intel/sgx_stub.c third_party/intel/sgx_detect_linux.c third_party/intel/create_enclave.c third_party/intel/oc_alloc.c \
              ECDSAImpl.c TestUtils.cpp sgxwallet.c
 COMMON_ENCLAVE_SRC = secure_enclave_u.c secure_enclave_u.h
 
@@ -117,4 +117,4 @@ cert_util_SOURCES= InvalidStateException.cpp  Exception.cpp InvalidArgumentExcep
 cert_util_LDADD=-LlibBLS/deps/deps_inst/x86_or_x64/lib -Lleveldb/build -LlibBLS/build \
                    -LlibBLS/build/libff/libff \
                    -l:libbls.a -l:libleveldb.a \
-                   -l:libff.a -lgmp  -ljsonrpccpp-stub -ljsonrpccpp-server -ljsonrpccpp-client -ljsonrpccpp-common -ljsoncpp -lmicrohttpd -lgnutls -lgcrypt -lcurl -lssl -lcrypto -lz -lpthread -ldl
+                   -l:libff.a -lgmp  -ljsonrpccpp-stub -ljsonrpccpp-server -ljsonrpccpp-client -ljsonrpccpp-common -ljsoncpp -lmicrohttpd -lgnutls -lgcrypt -lcurl -lssl -lcrypto -lz -lpthread -ldl
\ No newline at end of file

ServerInit.cpp

@@ -42,9 +42,9 @@
 
 #include "BLSPrivateKeyShareSGX.h"
 #include "sgxwallet_common.h"
-#include "create_enclave.h"
+#include "third_party/intel/create_enclave.h"
 #include "secure_enclave_u.h"
-#include "sgx_detect.h"
+#include "third_party/intel/sgx_detect.h"
 #include "sgxwallet.h"
 #include "LevelDB.h"
 #include "SGXWalletServer.h"

TestUtils.cpp

@@ -29,9 +29,9 @@
 #include <libff/algebra/fields/fp.hpp>
 #include <dkg/dkg.h>
 #include "sgxwallet_common.h"
-#include "create_enclave.h"
+#include "third_party/intel/create_enclave.h"
 #include "secure_enclave_u.h"
-#include "sgx_detect.h"
+#include "third_party/intel/sgx_detect.h"
 #include <gmp.h>
 #include <sgx_urts.h>
 #include <stdio.h>

TestUtils.h

@@ -32,9 +32,9 @@
 #include <libff/algebra/fields/fp.hpp>
 #include <dkg/dkg.h>
 #include "sgxwallet_common.h"
-#include "create_enclave.h"
+#include "third_party/intel/create_enclave.h"
 #include "secure_enclave_u.h"
-#include "sgx_detect.h"
+#include "third_party/intel/sgx_detect.h"
 #include <gmp.h>
 #include <sgx_urts.h>
 #include <stdio.h>

secure_enclave/Makefile.am

@@ -61,7 +61,6 @@ ENCLAVE_KEY=test_insecure_private_key.pem       #$(ENCLAVE)_private.pem
 
 
 ## Additional Automake flags needed to build the enclave.
-## ## -I./trusted_libff -I../trusted_libff
 
 AM_CPPFLAGS +=  -Wall -Wno-implicit-function-declaration $(TGMP_CPPFLAGS) -I./third_party/SCIPR -I../third_party/SCIPR -I../sgx-sdk-build/sgxsdk/include/libcxx \
               -I../intel-sgx-ssl/Linux/package/include

sgxwallet.h

@@ -26,9 +26,9 @@
 
 
 #include "sgxwallet_common.h"
-#include "create_enclave.h"
+#include "third_party/intel/create_enclave.h"
 #include "secure_enclave_u.h"
-#include "sgx_detect.h"
+#include "third_party/intel/sgx_detect.h"
 #include <gmp.h>
 #include <sgx_urts.h>
 

testw.cpp

@@ -29,9 +29,9 @@
 #include <libff/algebra/fields/fp.hpp>
 #include <dkg/dkg.h>
 #include "sgxwallet_common.h"
-#include "create_enclave.h"
+#include "third_party/intel/create_enclave.h"
 #include "secure_enclave_u.h"
-#include "sgx_detect.h"
+#include "third_party/intel/sgx_detect.h"
 #include <gmp.h>
 #include <sgx_urts.h>
 #include <stdio.h>

create_enclave.c → third_party/intel/create_enclave.c

@@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include "create_enclave.h"
-#include "sgx_stub.h"
+#include "third_party/intel/sgx_stub.h"
 #include <limits.h>
 #include <stdio.h>
 #include <sgx_urts.h>

sgx_detect_linux.c → third_party/intel/sgx_detect_linux.c

@@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <sgx_urts.h>
 #include <sgx_capable.h>
 #include <stdio.h>
-#include "sgx_stub.h"
+#include "third_party/intel/sgx_stub.h"
 #include "sgx_detect.h"
 
 unsigned long sgx_support = SGX_SUPPORT_UNKNOWN;