clearlinux/graphene
2
0
Fork 0
mirror of https://github.com/clearlinux/graphene.git synced 2026-09-05 13:21:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Linux-SGX] tools: add building to the parent Makefile

Browse Source
This commit is contained in:
Rafał Wojdyła
2020-04-08 22:15:42 +02:00
parent 0dd84ddf94
commit 113d19c19f
9 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfiles/ubuntu-16.04.dockerfile
+1
View File
@@ -15,6 +15,7 @@ RUN apt-get update \
git \
libapr1-dev \
libaprutil1-dev \
libcurl4-openssl-dev \
libexpat1 \
libexpat1-dev \
libnss-mdns \
Jenkinsfiles/ubuntu-18.04.dockerfile
+1
View File
@@ -14,6 +14,7 @@ RUN apt-get update && env DEBIAN_FRONTEND=noninteractive apt-get install -y \
git \
libapr1-dev \
libaprutil1-dev \
libcurl4-openssl-dev \
libelf-dev \
libexpat1 \
libexpat1-dev \
Pal/src/host/Linux-SGX/Makefile
+7 -1
View File
@@ -62,7 +62,7 @@ urts-asm-objs = sgx_entry.o
graphene_lib = .lib/graphene-lib.a
.PHONY: all
all: sgx-driver/sgx.h $(host_files)
all: sgx-driver/sgx.h $(host_files) tools
libpal-Linux-SGX.a: $(enclave-objs) $(enclave-asm-objs)
$(call cmd,ar_a_o)
@@ -120,6 +120,10 @@ endif
include ../../../../Scripts/Makefile.rules
.PHONY: tools
tools:
$(MAKE) -C tools
CLEAN_FILES += $(notdir $(pal_static) $(pal_lib) $(pal_loader))
CLEAN_FILES += debugger/sgx_gdb.so
CLEAN_FILES += quote/aesm.pb-c.c quote/aesm.pb-c.h quote/aesm.pb-c.d quote/aesm.pb-c.o
@@ -132,10 +136,12 @@ clean_:
.PHONY: clean
clean: clean_
$(MAKE) -C sgx-driver $@
$(MAKE) -C tools $@
.PHONY: distclean
distclean: clean_
$(MAKE) -C sgx-driver $@
$(MAKE) -C tools $@
.PHONY: test
test:
Pal/src/host/Linux-SGX/tools/common/.gitignore
+2
View File
@@ -0,0 +1,2 @@
/cJSON*
/*.gz
Pal/src/host/Linux-SGX/tools/common/attestation.c
-1
View File
@@ -18,7 +18,6 @@
#include <stdlib.h>
#include <string.h>
#include "api.h"
#include "attestation.h"
#include "cJSON.h"
#include "pal_crypto.h"
Pal/src/host/Linux-SGX/tools/ias-request/Makefile
+2 -1
View File
@@ -4,9 +4,10 @@ include ../../../../../../Scripts/Makefile.rules
CFLAGS += -I../.. \
-I../common \
-L../common \
-L../../../../../lib/crypto/mbedtls/install/lib \
-D_GNU_SOURCE
LDLIBS += -lsgx_util
LDLIBS += -lsgx_util -lmbedcrypto
PREFIX ?= /usr/local
Pal/src/host/Linux-SGX/tools/ias-request/ias_request.c
+3 -3
View File
@@ -88,18 +88,18 @@ int report(struct ias_context_t* ias, const char* quote_path, const char* nonce,
ssize_t quote_size;
quote_data = read_file(quote_path, &quote_size);
if (!quote_data) {
if (!quote_data || quote_size <= 0) {
ERROR("Failed to read quote file '%s'\n", quote_path);
goto out;
}
if (quote_size < sizeof(sgx_quote_t)) {
if ((size_t)quote_size < sizeof(sgx_quote_t)) {
ERROR("Quote is too small\n");
goto out;
}
sgx_quote_t* quote = (sgx_quote_t*)quote_data;
if (quote_size < sizeof(sgx_quote_t) + quote->signature_len) {
if ((size_t)quote_size < sizeof(sgx_quote_t) + quote->signature_len) {
ERROR("Quote is too small\n");
goto out;
}
Pal/src/host/Linux-SGX/tools/quote-dump/Makefile
+2 -1
View File
@@ -4,9 +4,10 @@ include ../../../../../../Scripts/Makefile.rules
CFLAGS += -I../.. \
-I../common \
-L../common \
-L../../../../../lib/crypto/mbedtls/install/lib \
-D_GNU_SOURCE
LDLIBS += -lsgx_util
LDLIBS += -lsgx_util -lmbedcrypto
PREFIX ?= /usr/local
Pal/src/host/Linux-SGX/tools/verify-ias-report/Makefile
+2 -1
View File
@@ -4,9 +4,10 @@ include ../../../../../../Scripts/Makefile.rules
CFLAGS += -I../.. \
-I../common \
-L../common \
-L../../../../../lib/crypto/mbedtls/install/lib \
-D_GNU_SOURCE
LDLIBS += -lsgx_util
LDLIBS += -lsgx_util -lmbedcrypto
PREFIX ?= /usr/local