mirror of
https://github.com/intel/linux-sgx
synced 2026-06-08 14:49:32 +00:00
Updates for SGX 2.19 reproducible build.
Signed-off-by: Zhang Lili <lili.z.zhang@intel.com>
This commit is contained in:
@@ -49,7 +49,6 @@
|
||||
#endif
|
||||
|
||||
#if defined(__GNUC__)
|
||||
# define TOKEN_FILENAME "enclave.token"
|
||||
# define ENCLAVE_FILENAME "enclave.signed.so"
|
||||
#endif
|
||||
|
||||
|
||||
@@ -49,7 +49,6 @@
|
||||
#endif
|
||||
|
||||
#if defined(__GNUC__)
|
||||
# define TOKEN_FILENAME "enclave.token"
|
||||
# define ENCLAVE_FILENAME "enclave.signed.so"
|
||||
#endif
|
||||
|
||||
|
||||
@@ -49,7 +49,6 @@
|
||||
#endif
|
||||
|
||||
#if defined(__GNUC__)
|
||||
# define TOKEN_FILENAME "enclave.token"
|
||||
# define ENCLAVE_FILENAME "enclave.signed.so"
|
||||
#endif
|
||||
|
||||
|
||||
@@ -37,14 +37,12 @@ RM = rm -f
|
||||
|
||||
ifneq ($(SGX_MODE), HW)
|
||||
URTS_LIB_NAME := sgx_urts_sim
|
||||
UAE_SERVICE_LIB := sgx_uae_service_sim
|
||||
else
|
||||
URTS_LIB_NAME := sgx_urts
|
||||
UAE_SERVICE_LIB := sgx_uae_service
|
||||
endif
|
||||
|
||||
INC:=-I$(SGX_SDK)/include -I../Include
|
||||
LIB := -l$(URTS_LIB_NAME) -l$(UAE_SERVICE_LIB) -L$(SGX_SDK)/lib64 -lpthread
|
||||
LIB := -l$(URTS_LIB_NAME) -L$(SGX_SDK)/lib64 -lpthread
|
||||
CXXFLAGS += $(INC) $(LIB)
|
||||
CFLAGS += $(INC) $(LIB)
|
||||
|
||||
|
||||
@@ -37,14 +37,12 @@ RM = rm -f
|
||||
|
||||
ifneq ($(SGX_MODE), HW)
|
||||
URTS_LIB_NAME := sgx_urts_sim
|
||||
UAE_SERVICE_LIB := sgx_uae_service_sim
|
||||
else
|
||||
URTS_LIB_NAME := sgx_urts
|
||||
UAE_SERVICE_LIB := sgx_uae_service
|
||||
endif
|
||||
|
||||
INC:=-I$(SGX_SDK)/include -I../Include
|
||||
LIB := -l$(URTS_LIB_NAME) -l$(UAE_SERVICE_LIB) -L$(SGX_SDK)/lib64 -lpthread
|
||||
LIB := -l$(URTS_LIB_NAME) -L$(SGX_SDK)/lib64 -lpthread
|
||||
CXXFLAGS += $(INC) $(LIB)
|
||||
CFLAGS += $(INC) $(LIB)
|
||||
|
||||
|
||||
@@ -37,14 +37,12 @@ RM = rm -f
|
||||
|
||||
ifneq ($(SGX_MODE), HW)
|
||||
URTS_LIB_NAME := sgx_urts_sim
|
||||
UAE_SERVICE_LIB := sgx_uae_service_sim
|
||||
else
|
||||
URTS_LIB_NAME := sgx_urts
|
||||
UAE_SERVICE_LIB := sgx_uae_service
|
||||
endif
|
||||
|
||||
INC:=-I$(SGX_SDK)/include -I../Include
|
||||
LIB := -l$(URTS_LIB_NAME) -l$(UAE_SERVICE_LIB) -L$(SGX_SDK)/lib64 -lpthread
|
||||
LIB := -l$(URTS_LIB_NAME) -L$(SGX_SDK)/lib64 -lpthread
|
||||
|
||||
CXXFLAGS += $(INC) $(LIB)
|
||||
CFLAGS += $(INC) $(LIB)
|
||||
|
||||
@@ -49,7 +49,6 @@
|
||||
#endif
|
||||
|
||||
#if defined(__GNUC__)
|
||||
# define TOKEN_FILENAME "enclave.token"
|
||||
# define ENCLAVE_FILENAME "enclave.signed.so"
|
||||
#endif
|
||||
|
||||
|
||||
@@ -1,3 +1,34 @@
|
||||
/*
|
||||
* Copyright (C) 2011-2021 Intel Corporation. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
* the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
* * Neither the name of Intel Corporation nor the names of its
|
||||
* contributors may be used to endorse or promote products derived
|
||||
* from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
*/
|
||||
|
||||
package lm;
|
||||
message Person
|
||||
{
|
||||
|
||||
@@ -1,3 +1,34 @@
|
||||
/*
|
||||
* Copyright (C) 2011-2021 Intel Corporation. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
* the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
* * Neither the name of Intel Corporation nor the names of its
|
||||
* contributors may be used to endorse or promote products derived
|
||||
* from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
*/
|
||||
|
||||
#include <netinet/in.h>
|
||||
#include <byteswap.h>
|
||||
|
||||
|
||||
@@ -1,3 +1,34 @@
|
||||
/*
|
||||
* Copyright (C) 2011-2021 Intel Corporation. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
* the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
* * Neither the name of Intel Corporation nor the names of its
|
||||
* contributors may be used to endorse or promote products derived
|
||||
* from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
*/
|
||||
|
||||
#include <netinet/in.h>
|
||||
#include <byteswap.h>
|
||||
|
||||
|
||||
@@ -93,12 +93,6 @@ endif
|
||||
App_Compile_CXXFlags := $(App_Compile_CFlags)
|
||||
App_Link_Flags := -L$(SGX_LIBRARY_PATH) -l$(Urts_Library_Name) -lpthread
|
||||
|
||||
ifneq ($(SGX_MODE), HW)
|
||||
App_Link_Flags += -lsgx_uae_service_sim
|
||||
else
|
||||
App_Link_Flags += -lsgx_uae_service
|
||||
endif
|
||||
|
||||
Gen_Untrusted_Source := App/Enclave_u.c
|
||||
Gen_Untrusted_Object := App/Enclave_u.o
|
||||
|
||||
|
||||
@@ -49,7 +49,6 @@
|
||||
# define FALSE 0
|
||||
#endif
|
||||
|
||||
# define TOKEN_FILENAME "enclave.token"
|
||||
# define ENCLAVE_FILENAME "enclave.signed.so"
|
||||
|
||||
extern sgx_enclave_id_t global_eid; /* global enclave id */
|
||||
|
||||
@@ -49,7 +49,6 @@
|
||||
# define FALSE 0
|
||||
#endif
|
||||
|
||||
# define TOKEN_FILENAME "enclave.token"
|
||||
# define ENCLAVE_FILENAME "enclave.signed.so"
|
||||
|
||||
extern sgx_enclave_id_t global_eid; /* global enclave id */
|
||||
|
||||
@@ -45,7 +45,6 @@
|
||||
|
||||
#define SEAL_FILENAME "Seal.signed.so"
|
||||
#define SEALED_KEY_FILE_NAME "sealed_key.bin"
|
||||
#define TOKEN_FILENAME "enclave.token"
|
||||
|
||||
/* Global EID shared by multiple threads */
|
||||
sgx_enclave_id_t global_eid = 0;
|
||||
|
||||
@@ -49,7 +49,6 @@
|
||||
# define FALSE 0
|
||||
#endif
|
||||
|
||||
#define TOKEN_FILENAME "enclave.token"
|
||||
#define ENCLAVE_FILENAME "enclave.signed.so"
|
||||
#define SEAL_TOKEN_FILENAME "seal.token"
|
||||
#define SEAL_FILENAME "Seal.signed.so"
|
||||
|
||||
@@ -49,7 +49,6 @@
|
||||
# define FALSE 0
|
||||
#endif
|
||||
|
||||
# define TOKEN_FILENAME "enclave.token"
|
||||
# define ENCLAVE_FILENAME "enclave.signed.so"
|
||||
|
||||
extern sgx_enclave_id_t global_eid; /* global enclave id */
|
||||
|
||||
@@ -104,12 +104,6 @@ App_Link_Flags := -L$(SGX_LIBRARY_PATH) \
|
||||
-Wl,--whole-archive -lsgx_uswitchless -Wl,--no-whole-archive \
|
||||
-l$(Urts_Library_Name) -lpthread
|
||||
|
||||
ifneq ($(SGX_MODE), HW)
|
||||
App_Link_Flags += -lsgx_uae_service_sim
|
||||
else
|
||||
App_Link_Flags += -lsgx_uae_service
|
||||
endif
|
||||
|
||||
App_Cpp_Objects := $(App_Cpp_Files:.cpp=.o)
|
||||
|
||||
App_Name := app
|
||||
|
||||
Reference in New Issue
Block a user